3714 files changed, 463 insertions, 7021 deletions

diff --git a/.classpath b/.classpath
deleted file mode 100644
index ec5f3187ab..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,48 +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.10.1.jar"/>
-	<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-5.0.0.jar" sourcepath="lib/ooxml/xmlbeans-5.0.0-sources.jar"/>
-	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml/curvesapi-1.06.jar"/>
-	<classpathentry exported="true" kind="lib" path="build/dist/maven/poi-ooxml-full/poi-ooxml-full-5.0.0-SNAPSHOT.jar" sourcepath="build/xmlbean-sources"/>
-	<classpathentry kind="lib" path="lib/main-tests/jmh-core-1.26.jar"/>
-	<classpathentry kind="lib" path="lib/main-tests/jmh-generator-annprocess-1.26.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry exported="true" kind="lib" path="compile-lib/log4j-api-2.14.0.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.68.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.68.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-tests/reflections-0.9.12.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-tests/guava-30.0-jre.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-tests/javassist-3.27.0-GA.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-tests/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ooxml-provided/xmlsec-2.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/main-tests/xmlunit-core-2.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-compress-1.20.jar"/>
-	<classpathentry kind="lib" path="lib/mockito-core-3.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/main-tests/byte-buddy-1.10.18.jar"/>
-	<classpathentry kind="lib" path="lib/main-tests/byte-buddy-agent-1.10.18.jar"/>
-	<classpathentry kind="lib" path="compile-lib/batik-all-1.14.jar"/>
-	<classpathentry kind="lib" path="lib/SparseBitSet-1.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.project b/.project
deleted file mode 100644
index 274051f30a..0000000000
--- a/.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/.settings/com.vaadin.designer.prefs b/.settings/com.vaadin.designer.prefs
deleted file mode 100644
index 83e545c06d..0000000000
--- a/.settings/com.vaadin.designer.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-applicationTheme=Project structure is not supported.

-eclipse.preferences.version=1

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80263..0000000000
--- a/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1

-encoding/<project>=UTF-8

diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 18eea4af5d..0000000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,419 +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.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-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.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-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=warning
-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.nonnullTypeVariableFromLegacyInvocation=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.pessimisticNullAnalysisForFreeTypeVariables=warning
-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.8
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
-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_expressions_in_for_loop_header=0
-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_parameterized_type_references=0
-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_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
-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_enum_constant=insert
-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.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
-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_assignment_operator=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5227bd2854..0000000000
--- a/.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/.settings/org.moreunit.core.prefs b/.settings/org.moreunit.core.prefs
deleted file mode 100644
index efd9d77f2e..0000000000
--- a/.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/.settings/org.moreunit.prefs b/.settings/org.moreunit.prefs
deleted file mode 100644
index 659afaf8c2..0000000000
--- a/.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/build.gradle b/build.gradle
index 4247631df4..df2d2ba6d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,7 +163,7 @@ subprojects {
         // http://forums.gradle.org/gradle/topics/jacoco_related_failure_in_multiproject_build
         systemProperties['user.dir'] = workingDir
 
-        systemProperties['POI.testdata.path'] = '../../test-data'
+        systemProperties['POI.testdata.path'] = '../test-data'
 
         // this is necessary for JDK 9+ to keep formatting dates the same way as in previous JDK-versions
         systemProperties['java.locale.providers'] = 'JRE,CLDR'
@@ -195,7 +195,7 @@ subprojects {
             properties {
                 // as we currently use build/<module>/ as project-basedir, we need to tell Sonar to use
                 // the root-folder as "basedir" for the projects
-                property "sonar.projectBaseDir", "$projectDir/../.."
+                property "sonar.projectBaseDir", "$projectDir"
                 // currently supported providers on Jenkins: "hg,git": property "sonar.scm.provider", "svn"
 
                 // the plugin seems to not detect our non-standard build-layout
@@ -213,208 +213,4 @@ subprojects {
         txtOutputFile = file("$buildDir/reports/japi.txt")
         htmlOutputFile = file("$buildDir/reports/japi.html")
     }
-}
-
-project('main') {
-    sourceSets.main.java.srcDirs = ['../../src/java']
-    sourceSets.main.resources.srcDirs = ['../../src/resources/main']
-    sourceSets.test.java.srcDirs = ['../../src/testcases']
-    sourceSets.test.resources.srcDirs = ['../../src/resources/test']
-
-    dependencies {
-        implementation "commons-codec:commons-codec:${commonsCodecVersion}"
-        implementation 'org.apache.commons:commons-collections4:4.4'
-        implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
-        implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-        implementation 'javax.activation:activation:1.1.1'
-        api 'com.zaxxer:SparseBitSet:1.2'
-
-        testImplementation 'org.reflections:reflections:0.9.12'
-    }
-
-    jar {
-        manifest {
-            attributes 'Automatic-Module-Name': 'org.apache.poi.main'
-        }
-    }
-
-    // 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
-    }
-
-    japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
-}
-
-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']
-    sourceSets.test.resources.srcDirs = ['../../src/resources/test']
-
-    configurations {
-        antdep
-    }
-
-    dependencies {
-        antdep 'org.apache.ant:ant:1.10.9'
-    }
-
-    // we need to ensure that the custom ant tasks are compiled before we import the build.xml file
-    ant.mkdir(dir: "../../build/poi-ant-contrib")
-    ant.javac(srcdir: "../../src/excelant/poi-ant-contrib"
-            , destdir: "../../build/poi-ant-contrib"
-            , classpath: configurations.antdep.asPath
-            , includeantruntime: "true"
-            , excludes: "Junit5Progress.java"
-    )
-
-    // 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 {
-        api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
-        implementation 'org.apache.commons:commons-collections4:4.4'
-        api "org.apache.commons:commons-compress:${commonsCompressVersion}"
-        api 'org.apache.santuario:xmlsec:2.2.1'
-        api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
-        api 'com.github.virtuald:curvesapi:1.06'
-        implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-
-        api "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
-        implementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") {
-            exclude group: 'org.apache.xmlgraphics', module: 'batik-script'
-        }
-        implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}"
-
-        api 'de.rototor.pdfbox:graphics2d:0.31'
-
-        api project(':main')
-        api files("../../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
-
-        testRuntime project(':scratchpad')
-        testImplementation 'org.xmlunit:xmlunit-core:2.8.0'
-        testImplementation 'org.reflections:reflections:0.9.12'
-        testImplementation project(path: ':main', configuration: 'tests')
-        testImplementation 'org.openjdk.jmh:jmh-core:1.26'
-        testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
-        testImplementation 'com.google.guava:guava:30.0-jre'
-    }
-
-    jar {
-        manifest {
-            attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml'
-        }
-    }
-
-    japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
-
-    test {
-        // for some reason catching the OOM does not work when run from Gradle
-        exclude '**/MemoryUsage.class'
-    }
-}
-
-project('examples') {
-    sourceSets.main.java.srcDirs = ['../../src/examples/src']
-
-    dependencies {
-        implementation project(':ooxml')
-        implementation project(':scratchpad')
-
-        implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
-    }
-
-    japicmp.enabled = false
-}
-
-
-project('excelant') {
-    sourceSets.main.java.srcDirs = ['../../src/excelant/java']
-    sourceSets.main.resources.srcDirs = ['../../src/excelant/resources']
-    sourceSets.test.java.srcDirs = ['../../src/excelant/testcases']
-    sourceSets.test.resources.srcDirs = ['../../src/resources/test']
-
-    dependencies {
-        api 'org.apache.ant:ant:1.10.9'
-
-        api project(':ooxml')
-
-        testImplementation project(path: ':main', configuration: 'tests')
-    }
-
-    jar {
-        manifest {
-            attributes 'Automatic-Module-Name': 'org.apache.poi.excelant'
-        }
-    }
-
-    japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar"
-}
-
-project('integrationtest') {
-    sourceSets.test.java.srcDirs = ['../../src/integrationtest']
-    sourceSets.test.resources.srcDirs = ['../../src/resources/integrationtest']
-
-    dependencies {
-        testImplementation 'org.apache.ant:ant:1.10.9'
-
-        testImplementation project(':ooxml')
-        testImplementation project(':scratchpad')
-        testImplementation project(':examples')
-
-        testImplementation files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
-    }
-
-    jar {
-        manifest {
-            attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest'
-        }
-    }
-
-    test {
-        // exclude these from the normal test-run
-        exclude '**/*FileHandler.class'
-    }
-
-    japicmp.enabled = false
-}
-
-project('scratchpad') {
-    sourceSets.main.java.srcDirs = ['../../src/scratchpad/src']
-    sourceSets.main.resources.srcDirs = ['../../src/resources/scratchpad']
-    sourceSets.test.java.srcDirs = ['../../src/scratchpad/testcases']
-    sourceSets.test.resources.srcDirs = ['../../src/resources/test']
-
-    dependencies {
-        api project(':main')
-        implementation "commons-codec:commons-codec:${commonsCodecVersion}"
-        implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
-        implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-
-        testImplementation project(path: ':main', configuration: 'tests')
-    }
-
-    jar {
-        manifest {
-            attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad'
-        }
-    }
-
-    japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
-}
+}
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 509288ab31..8ea0ec80ca 100644
--- a/build.xml
+++ b/build.xml
@@ -89,9 +89,9 @@ under the License.
         <attribute name="name"/>
         <attribute name="value"/>
         <sequential>
-            <mkdir dir="build/poi-ant-contrib"/>
-            <javac srcdir="src/excelant/poi-ant-contrib" destdir="build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
-            <taskdef name="PropertyResetHelper" classname="PropertyReset" classpath="build/poi-ant-contrib"/>
+            <mkdir dir="excelant/build/poi-ant-contrib"/>
+            <javac srcdir="excelant/src//poi-ant-contrib/java" destdir="excelant/build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
+            <taskdef name="PropertyResetHelper" classname="PropertyReset" classpath="excelant/build/poi-ant-contrib"/>
             <PropertyResetHelper name="@{name}" value="@{value}" />
         </sequential>
     </macrodef>
@@ -115,66 +115,65 @@ under the License.
     <property name="tempdir" value="build/tmp"/>
 
     <!-- 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.resources.test" location="src/resources/test"/>
+    <property name="main.resources.main" value="main/src/main/resources"/>
+    <property name="main.src" location="main/src/main/java"/>
+    <property name="main.src.test" location="main/src/test/java"/>
+    <property name="main.resources.test" location="main/src/test/resources"/>
     <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"/>
+    <property name="main.output.dir" location="main/build/classes"/>
+    <property name="main.output.test.dir" location="main/build/test-classes"/>
+    <property name="main.reports.test" location="main/build/test-results"/>
+    <property name="main.testokfile" location="main/build/testokfile.txt"/>
+    <property name="main.output.gen-sources.dir" location="main/build/generated-sources"/>
+    <property name="main.version.template" location="main/src/main/version/Version.java.template"/>
+    <property name="main.version.java" location="${main.output.gen-sources.dir}/org/apache/poi/Version.java"/>
 
     <!-- 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.resources.test" location="src/resources/test"/>
-    <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"/>
+    <property name="scratchpad.resources.main" value="scratchpad/src/main/resources"/>
+    <property name="scratchpad.src" location="scratchpad/src/main/java"/>
+    <property name="scratchpad.src.test" location="scratchpad/src/test/java"/>
+    <property name="scratchpad.resources.test" location="scratchpad/src/main/resources"/>
+    <property name="scratchpad.reports.test" location="scratchpad/build/test-results"/>
+    <property name="scratchpad.output.dir" location="scratchpad/build/classes"/>
+    <property name="scratchpad.output.test.dir" location="scratchpad/build/test-classes"/>
+    <property name="scratchpad.testokfile" location="scratchpad/build/testokfile.txt"/>
 
     <!-- Examples: -->
-    <property name="examples.src" location="src/examples/src"/>
-    <property name="examples.output.dir" location="build/examples-classes"/>
+    <property name="examples.src" location="examples/src/main/java"/>
+    <property name="examples.output.dir" location="examples/build/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.resources.test" location="src/resources/test"/>
-    <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.src" location="ooxml/src/main/java"/>
+    <property name="ooxml.resources.main" value="ooxml/src/main/resources"/>
+    <property name="ooxml.src.test" location="ooxml/src/test/java"/>
+    <property name="ooxml.resources.test" location="ooxml/src/test/resources"/>
+    <property name="ooxml.reports.test" location="ooxml/build/test-results"/>
+    <property name="ooxml.output.dir" location="ooxml/build/classes"/>
+    <property name="ooxml.output.test.dir" location="ooxml/build/test-classes"/>
+    <property name="ooxml.testokfile" location="ooxml/build/testokfile.txt"/>
 
     <property name="ooxml.lite.agent" location="lib/ooxml-tests/ooxml-lite-agent.jar"/>
-    <property name="ooxml.lite.report" location="build/ooxml-lite-report"/>
+    <property name="ooxml.lite.report" location="ooxml-schema/build/ooxml-lite-report"/>
     <property name="ooxml.lite.jar" location="build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${version.id}.jar"/>
     <property name="ooxml.lite.includes" value="^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"/>
 
 
     <!-- Integration testing: -->
-    <property name="integration.src.test" location="src/integrationtest"/>
-    <property name="integration.resources.test" location="src/resources/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"/>
+    <property name="integration.src.test" location="integrationtest/src/test/java"/>
+    <property name="integration.resources.test" location="integrationtest/src/test/resources"/>
+    <property name="integration.reports.test" location="integrationtest/build/test-results"/>
+    <property name="integration.output.test.dir" location="integrationtest/build/test-classes"/>
+    <property name="integration.testokfile" location="integrationtest/build/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.resources.test" location="src/resources/test"/>
-    <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"/>
+    <property name="excelant.resource.main" value="excelant/src/main/resources"/>
+    <property name="excelant.src" location="excelant/src/main/java"/>
+    <property name="excelant.src.test" location="excelant/src/test/java"/>
+    <property name="excelant.resources.test" location="excelant/src/test/resources"/>
+    <property name="excelant.reports.test" location="excelant/build/test-results"/>
+    <property name="excelant.output.dir" location="excelant/build/classes"/>
+    <property name="excelant.output.test.dir" location="excelant/build/test-classes"/>
+    <property name="excelant.testokfile" location="excelant/build/testokfile.txt"/>
 
     <macrodef name="dependency">
         <attribute name="prefix"/>
@@ -348,18 +347,21 @@ under the License.
 
     <!-- See https://www.ecma-international.org/publications/standards/Ecma-376.htm -->
     <!-- "Copy these file(s), free of charge" -->
-    <property name="ooxml.xsds.izip.1" value="${basedir}/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
-    <property name="ooxml.xsds.src.dir" location="build/ooxml-xsds-src"/>
+    <property name="ooxml-schema.output.dir" location="ooxml-schema/build/classes"/>
+    <property name="ooxml-schema.output.test.dir" location="ooxml-schema/build/test-classes"/>
+    <property name="ooxml-schema.output.gen-sources.dir" location="ooxml-schema/build/generated-sources"/>
+    <property name="ooxml-schema.output.gen-classes.dir" location="ooxml-schema/build/generated-classes"/>
+    <property name="ooxml.xsds.izip.1" value="${basedir}/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
+    <property name="ooxml.xsds.src.dir" location="ooxml-schema/build/xsds"/>
     <property name="ooxml.xsds.src.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}-sources.jar"/>
     <property name="ooxml.xsds.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}.jar"/>
 
     <!-- additional schemas are packed into the poi schemas jar, -->
     <!-- so we don't have to care about a separate versioning of the original ooxml schemas -->
-    <property name="ooxml.xsds.izip.2" value="${basedir}/src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip"/>
-    <property name="ooxml.security.src.dir" location="build/ooxml-security-src"/>
-    <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="ooxml.xsds.izip.2" value="${basedir}/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip"/>
+    <property name="ooxml.security.xsd.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt"/>
+    <property name="ooxml.visio.xsd.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf"/>
+    <property name="ooxml.schema.xsdconfig.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/schemas"/>
 
     <!-- Coverage -->
     <property name="coverage.dir" value="build/coverage"/>
@@ -591,9 +593,12 @@ under the License.
         <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-schema.output.dir}"/>
+        <mkdir dir="${ooxml-schema.output.test.dir}"/>
+        <mkdir dir="${ooxml-schema.output.gen-sources.dir}"/>
+        <mkdir dir="${ooxml-schema.output.gen-classes.dir}"/>
         <mkdir dir="${ooxml.reports.test}"/>
         <mkdir dir="${excelant.output.dir}"/>
         <mkdir dir="${excelant.output.test.dir}"/>
@@ -618,6 +623,13 @@ under the License.
 
     <target name="clean" description="Remove generated artefacts">
         <delete dir="build"/>
+        <delete dir="examples/build"/>
+        <delete dir="excelant/build"/>
+        <delete dir="integrationtest/build"/>
+        <delete dir="main/build"/>
+        <delete dir="ooxml/build"/>
+        <delete dir="ooxml-schema/build"/>
+        <delete dir="scratchpad/build"/>
         <delete includeemptydirs="true">
             <fileset dir="sonar">
                 <include name="*/target/**"/>
@@ -908,11 +920,9 @@ under the License.
             <equals arg1="${sun.arch.data.model}" arg2="64" />
         </condition>
 
-        <local name="xmlbean.xsds.dir"/>
-        <property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/>
-        <mkdir dir="${xmlbean.xsds.dir}"/>
+        <mkdir dir="${ooxml.xsds.src.dir}"/>
 
-        <copy todir="${xmlbean.xsds.dir}">
+        <copy todir="${ooxml.xsds.src.dir}">
             <zipfileset src="${ooxml.xsds.izip.1}"/>
             <fileset dir="${ooxml.visio.xsd.dir}"/>
             <fileset dir="${ooxml.schema.xsdconfig.dir}" includes="ooxmlSchemas.xsdconfig,markup-compatibility.xsd,vmlDrawing.xsd"/>
@@ -921,13 +931,6 @@ under the License.
             <fileset dir="${ooxml.schema.xsdconfig.dir}" includes="XAdES*.xsd,*.xsdconfig,xmldsig*.xsd"/>
         </copy>
 
-        <local name="xmlbean.sources.dir"/>
-        <local name="xmlbean.classes.dir"/>
-        <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/>
-        <property name="xmlbean.classes.dir" location="build/xmlbean-classes"/>
-        <mkdir dir="${xmlbean.sources.dir}"/>
-        <mkdir dir="${xmlbean.classes.dir}"/>
-
         <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean">
             <classpath>
                 <path location="${ooxml.xmlbeans.jar}"/>
@@ -937,10 +940,10 @@ under the License.
         </taskdef>
 
         <xmlbean
-            schema="${xmlbean.xsds.dir}"
-            srcgendir="${xmlbean.sources.dir}"
-            classgendir="${xmlbean.classes.dir}"
-            destfile="${xmlbean.xsds.dir}.jar"
+            schema="${ooxml.xsds.src.dir}"
+            srcgendir="${ooxml-schema.output.gen-sources.dir}"
+            classgendir="${ooxml-schema.output.gen-classes.dir}"
+            destfile="${ooxml.xsds.src.dir}.jar"
             srconly="true"
             failonerror="true"
             fork="true"
@@ -955,31 +958,35 @@ under the License.
         <javac release="8"
                target="${jdk.version.class}"
                source="${jdk.version.source}"
-               srcdir="${xmlbean.sources.dir}"
-               destdir="${xmlbean.classes.dir}"
+               srcdir="${ooxml-schema.output.gen-sources.dir}"
+               destdir="${ooxml-schema.output.dir}"
                encoding="${java.source.encoding}"
                fork="yes"
                debug="${compile.debug}"
                memoryMaximumSize="${ooxml.memory}"
                includeantruntime="false">
             <classpath refid="ooxml.classpath"/>
+            <classpath>
+                <pathelement path="${ooxml-schema.output.gen-classes.dir}"/>
+            </classpath>
         </javac>
 
         <javac release="9"
-               srcdir="${basedir}/src/multimodule/ooxml-full/java9"
-               destdir="${basedir}/src/multimodule/ooxml-full/java9"
+               srcdir="${basedir}/ooxml-schema/src/ooxml-full/java9"
+               destdir="${basedir}/ooxml-schema/src/ooxml-full/java9"
                includeantruntime="false"
                fork="true"
                modulepath="lib/ooxml"
                unless:true="${isJava8}">
-            <compilerarg line="--patch-module org.apache.poi.ooxml.schemas=${xmlbean.classes.dir}"/>
+            <compilerarg line="--patch-module org.apache.poi.ooxml.schemas=${ooxml-schema.output.dir}"/>
         </javac>
 
         <mkdir dir="build/dist/maven/poi-ooxml-full"/>
 
         <jar destfile="${ooxml.xsds.jar}">
-            <fileset dir="${xmlbean.classes.dir}"/>
-            <zipfileset dir="${basedir}/src/multimodule/ooxml-full/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <fileset dir="${ooxml-schema.output.dir}"/>
+            <fileset dir="${ooxml-schema.output.gen-classes.dir}"/>
+            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-full/java9" prefix="META-INF/versions/9" excludes="*.java"/>
             <metainf dir="legal/"/>
             <manifest>
                 <attribute name="Multi-Release" value="true"/>
@@ -996,8 +1003,8 @@ under the License.
         </jar>
 
         <jar destfile="${ooxml.xsds.src.jar}">
-            <fileset dir="${xmlbean.sources.dir}"/>
-            <zipfileset dir="${basedir}/src/multimodule/ooxml-full/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
+            <fileset dir="${ooxml-schema.output.gen-sources.dir}"/>
+            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-full/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
             <metainf dir="legal"/>
         </jar>
     </target>
@@ -1032,7 +1039,7 @@ under the License.
                 <string>@{module}</string>
                 <filterchain>
                     <prefixlines prefix="poi-"/>
-                    <replacestring from="poi-poi" to="poi"/>
+                    <replacestring from="poi-main" to="poi"/>
                 </filterchain>
             </loadresource>
 
@@ -1053,8 +1060,8 @@ under the License.
 
             <!-- compile jigsaw files to sources, so we don't forget to update/provide them for Java 8 builds -->
             <javac release="9"
-                   srcdir="${basedir}/src/multimodule/@{module}/java9"
-                   destdir="${basedir}/src/multimodule/@{module}/java9"
+                   srcdir="${basedir}/@{module}/src/main/java9"
+                   destdir="${basedir}/@{module}/src/main/java9"
                    includeantruntime="false"
                    fork="true"
                    unless:true="${isJava8}">
@@ -1070,7 +1077,7 @@ under the License.
             <jar destfile="build/dist/maven/${maven-name}/${maven-name}-@{version}.jar">
                 <fileset dir="@{classes}"/>
                 <resources/>
-                <zipfileset dir="${basedir}/src/multimodule/@{module}/java9"
+                <zipfileset dir="${basedir}/@{module}/src/main/java9"
                             prefix="META-INF/versions/9"
                             excludes="*.java"/>
                 <metainf dir="legal/"/>
@@ -1112,8 +1119,8 @@ under the License.
             </pathconvert>
 
             <javac release="9"
-                   srcdir="${basedir}/src/multimodule/@{module}/test9"
-                   destdir="${basedir}/src/multimodule/@{module}/test9"
+                   srcdir="${basedir}/@{module}/src/test/java9"
+                   destdir="${basedir}/@{module}/src/test/java9"
                    includeantruntime="false"
                    fork="true"
                    unless:true="${isJava8}" unless:blank="@{test}">
@@ -1131,7 +1138,7 @@ under the License.
                 </fileset>
                 <resources/>
                 <test-resources/>
-                <zipfileset dir="${basedir}/src/multimodule/@{module}/test9" prefix="META-INF/versions/9" excludes="*.java"/>
+                <zipfileset dir="${basedir}/@{module}/src/test/java9" prefix="META-INF/versions/9" excludes="*.java"/>
                 <metainf dir="legal/"/>
                 <manifest>
                     <attribute name="Multi-Release" value="true"/>
@@ -1151,8 +1158,6 @@ under the License.
             <jar destfile="build/dist/maven/${maven-name}/${maven-name}-@{version}-sources.jar">
                 <fileset dir="@{java}"/>
                 <metainf dir="legal/"/>
-<!--                <resources/>-->
-<!--                <zipfileset dir="src/multimodule/@{module}/java9" prefix="META-INF/versions/9" excludes="*.class"/>-->
                 <manifest>
                     <attribute name="Built-By" value="${user.name}"/>
                     <attribute name="Specification-Title" value="Apache POI"/>
@@ -1168,7 +1173,7 @@ under the License.
     </macrodef>
 
     <target name="compile-main" depends="init, compile-version">
-        <compile-jar module="poi"
+        <compile-jar module="main"
             java="${main.src}" classes="${main.output.dir}"
             test="${main.src.test}" test-classes="${main.output.test.dir}">
             <lib>
@@ -1176,7 +1181,7 @@ under the License.
                 <pathelement path="lib/main-tests"/>
             </lib>
             <resources>
-                <fileset dir="${main.resource1.dir}"/>
+                <fileset dir="${main.resources.main}"/>
             </resources>
             <test-resources>
                 <fileset dir="${main.resources.test}" />
@@ -1194,7 +1199,7 @@ under the License.
                 <pathelement path="lib/main-tests"/>
             </lib>
             <resources>
-                <fileset dir="${scratchpad.resource1.dir}"/>
+                <fileset dir="${scratchpad.resources.main}"/>
             </resources>
             <test-resources>
                 <fileset dir="${scratchpad.resources.test}" />
@@ -1232,17 +1237,14 @@ under the License.
                 <pathelement path="lib/ooxml-batik"/>
             </lib>
             <resources>
-                <fileset dir="${ooxml.resource1.dir}"/>
+                <fileset dir="${ooxml.resources.main}"/>
             </resources>
-            <test-resources>
-                <fileset dir="${ooxml.resources.test}" />
-            </test-resources>
         </compile-jar>
 
         <!-- create ooxml-lite-agent jar -->
         <javac release="9"
-               srcdir="${basedir}/src/multimodule/ooxml-lite-agent/java9"
-               destdir="${basedir}/src/multimodule/ooxml-lite-agent/java9"
+               srcdir="${basedir}/ooxml/src/ooxml-lite-agent/java9"
+               destdir="${basedir}/ooxml/src/ooxml-lite-agent/java9"
                includeantruntime="false"
                fork="true"
                modulepath="${basedir}/lib/main-tests"
@@ -1252,7 +1254,7 @@ under the License.
 
         <jar destfile="${ooxml.lite.agent}">
             <fileset dir="${ooxml.output.test.dir}" includes="org/apache/poi/ooxml/lite/**"/>
-            <zipfileset dir="${basedir}/src/multimodule/ooxml-lite-agent/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <zipfileset dir="${basedir}/ooxml/src/ooxml-lite-agent/java9" prefix="META-INF/versions/9" excludes="*.java"/>
             <manifest>
                 <attribute name="Multi-Release" value="true"/>
                 <attribute name="Automatic-Module-Name" value="org.apache.poi.ooxml_lite"/>
@@ -1302,8 +1304,8 @@ under the License.
             </path>
 
 
-            <mkdir dir="build/poi-ant-contrib"/>
-            <javac srcdir="src/excelant/poi-ant-contrib" destdir="build/poi-ant-contrib"
+            <mkdir dir="excelant/build/poi-ant-contrib"/>
+            <javac srcdir="excelant/src/poi-ant-contrib/java" destdir="excelant/build/poi-ant-contrib"
                    includeantruntime="true" includes="Junit5Progress.java" classpathref="junit-jars"/>
 
 
@@ -1338,7 +1340,7 @@ under the License.
                 <classpath>
                     <path refid="junit-jars" if:true="${isJava8}"/>
                     <fileset dir="${basedir}" includes="${cp_java}" if:true="${isJava8}"/>
-                    <pathelement location="build/poi-ant-contrib"/>
+                    <pathelement location="excelant/build/poi-ant-contrib"/>
                 </classpath>
 
                 <testclasses outputDir="@{outputDir}">
@@ -1424,7 +1426,7 @@ under the License.
                 <pathelement path="lib/excelant"/>
             </lib>
             <resources>
-                <fileset dir="${excelant.resource.dir}"/>
+                <fileset dir="${excelant.resource.main}"/>
             </resources>
         </compile-jar>
     </target>
@@ -1457,7 +1459,7 @@ under the License.
         <mkdir dir="${integration.output.test.dir}/META-INF/versions/9"/>
 
         <javac release="9"
-               srcdir="${basedir}/src/multimodule/integration/java9"
+               srcdir="${basedir}/integrationtest/src/test/java9"
                destdir="${integration.output.test.dir}/META-INF/versions/9"
                includeantruntime="false"
                fork="true"
@@ -1476,20 +1478,20 @@ under the License.
             </modulepath>
         </javac>
 
-        <manifest file="build/poi-manifest.mf">
+        <manifest file="integrationtest/build/poi-manifest.mf">
             <attribute name="Multi-Release" value="true"/>
             <attribute name="Automatic-Module-Name" value="org.apache.poi.stress"/>
         </manifest>
 
         <jar destfile="build/dist/maven/poi-integration/poi-integration-${version.id}.jar"
              basedir="${integration.output.test.dir}"
-             manifest="build/poi-manifest.mf"/>
+             manifest="integrationtest/build/poi-manifest.mf"/>
     </target>
 
     <target name="-version-java-check">
 		<!-- recompile Version.java from the template whenever source or the version in build.xml changes -->
         <uptodate property="version.java.notRequired" targetfile="${main.output.dir}/org/apache/poi/Version.class">
-            <srcfiles file="src/resources/version/Version.java.template"/>
+            <srcfiles file="main/src/main/version/Version.java.template"/>
             <srcfiles file="build.xml"/>
         </uptodate>
     </target>
@@ -1499,11 +1501,11 @@ under the License.
 			depends="init, -version-java-check"
             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}">
+        <local name="version.dir"/>
+        <dirname property="version.dir" file="${main.version.java}"/>
+        <mkdir dir="${version.dir}"/>
+        <delete file="${main.version.java}"/>
+        <copy file="${main.version.template}" tofile="${main.version.java}" overwrite="true">
             <filterset>
                 <filter token="VERSION" value="${version.id}"/>
                 <filter token="DSTAMP" value="${DSTAMP}"/>
@@ -1513,12 +1515,9 @@ under the License.
         <!-- Compile -->
         <javac target="${jdk.version.class}" source="${jdk.version.source}"
                failonerror="true" destdir="${main.output.dir}" debug="on" fork="yes"
-               srcdir="${main.output.dir}"
+               srcdir="${main.output.gen-sources.dir}"
                encoding="${java.source.encoding}" includeantruntime="false">
         </javac>
-
-        <!-- Tidy up -->
-        <delete file="${version.java}"/>
     </target>
 
     <target name="jacocotask" depends="">
@@ -1653,8 +1652,8 @@ under the License.
     <target name="test-report" depends="init">
         <mkdir dir="build/report"/>
         <junitreport todir="build/report">
-          <fileset dir="build">
-            <include name="*results/**/TEST-*.xml"/>
+          <fileset dir=".">
+            <include name="**/build/test-results/**/TEST-*.xml"/>
           </fileset>
           <report format="frames" todir="build/report"/>
         </junitreport>
@@ -1822,7 +1821,7 @@ under the License.
 
         <local name="full.schema"/>
         <loadresource property="full.schema">
-            <file file="${basedir}/src/multimodule/ooxml-full/java9/module-info.java"/>
+            <file file="${basedir}/ooxml-schema/src/ooxml-full/java9/module-info.java"/>
             <filterchain>
                 <linecontains negate="true" matchany="true">
                     <contains value="exports"/>
@@ -1831,11 +1830,11 @@ under the License.
             </filterchain>
         </loadresource>
 
-        <echo output="${basedir}/src/multimodule/ooxml-lite/java9/module-info.java">${full.schema}${lite.exports}}</echo>
+        <echo output="${basedir}/ooxml-schema/src/ooxml-lite/java9/module-info.java">${full.schema}${lite.exports}}</echo>
 
         <javac release="9"
-               srcdir="${basedir}/src/multimodule/ooxml-lite/java9"
-               destdir="${basedir}/src/multimodule/ooxml-lite/java9"
+               srcdir="${basedir}/ooxml-schema/src/ooxml-lite/java9"
+               destdir="${basedir}/ooxml-schema/src/ooxml-lite/java9"
                includeantruntime="false"
                fork="true"
                unless:true="${isJava8}">
@@ -1870,7 +1869,7 @@ under the License.
         <mkdir dir="build/dist/maven/poi-ooxml-lite"/>
 
         <jar destfile="${ooxml.lite.jar}" duplicate="fail">
-            <zipfileset dir="${basedir}/src/multimodule/ooxml-lite/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-lite/java9" prefix="META-INF/versions/9" excludes="*.java"/>
             <zipfileset src="${ooxml.xsds.jar}">
                 <patternset>
                     <includesfile name="${ooxml.lite.report}.clazz1"/>
@@ -2141,20 +2140,6 @@ under the License.
         <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="Multi-Release" value="true"/>
-            <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="src"/>
         <attribute name="module"/>
@@ -2187,7 +2172,7 @@ under the License.
             <mkdir dir="@{src}/META-INF/versions/9"/>
 
             <javac release="9"
-                   srcdir="${basedir}/src/multimodule/@{module}/java9"
+                   srcdir="${basedir}/@{module}/src/main/java9"
                    destdir="@{src}/META-INF/versions/9"
                    includeantruntime="false"
                    fork="true"
@@ -2232,9 +2217,21 @@ under the License.
         <antcall target="javadocs"/>
     </target>
 
-    <target name="jar-javadocs" description="JavaDocs for Maven" depends="compile,-manifest,-do-jar-create-javadocs-package-list">
+    <target name="jar-javadocs" description="JavaDocs for Maven" depends="compile,-do-jar-create-javadocs-package-list">
         <property name="build.maven.javadocs" location="build/tmp/maven-javadocs"/>
 
+        <manifest file="build/poi-manifest.mf">
+            <attribute name="Multi-Release" value="true"/>
+            <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>
+
         <!-- Build and package the main javadocs -->
         <maven-javadocs src="${main.src}" dest="${jar.name}"/>
         <!-- Build and package the scratchpad javadocs -->
@@ -2329,7 +2326,7 @@ under the License.
         <union id="src-files" cache="true">
             <mappedresources refid="legal-files"/>
             <mappedresources cache="true">
-                <fileset dir="." excludes="build/**,
+                <fileset dir="." excludes="*/build/**,build/**,
                       dist*/**,
                       lib/**,
                       bin/**,
@@ -2440,27 +2437,30 @@ under the License.
              uri="antlib:org.apache.rat.anttasks"
              classpath="${rat.jar}" />
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
-            <fileset dir="src/">
+            <fileset dir="examples/src" excludes="main/java/org/apache/poi/**/*-chart-data.txt"/>
+            <fileset dir="excelant/src"/>
+            <fileset dir="integrationtest/src"/>
+            <fileset dir="main/src">
+                <exclude name="main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml" />
+            </fileset>
+            <fileset dir="ooxml/src">
+                <exclude name="main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml" />
+                <exclude name="main/resources/org/apache/poi/xslf/usermodel/empty.pptx" />
+                <exclude name="main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml" />
+            </fileset>
+            <fileset dir="ooxml-schema/src">
+                <exclude name="main/xmlschema/org/apache/poi/xdgf/visio.xsd" />
+                <exclude name="main/xmlschema/org/apache/poi/schemas/XAdES*.xsd" />
+                <exclude name="main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd" />
+                <exclude name="main/xmlschema/org/apache/poi/schemas/*.zip" />
+            </fileset>
+            <fileset dir="scratchpad/src"/>
+
+            <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="examples/src/org/apache/poi/**/*-chart-data.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="resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml" />
-                <exclude name="ooxml/resources/org/apache/poi/xdgf/visio.xsd" />
-                <exclude name="ooxml/resources/org/apache/poi/schemas/XAdES*.xsd" />
-                <exclude name="ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd" />
-                <exclude name="ooxml/resources/org/apache/poi/schemas/*.zip" />
-                <exclude name="**/*.iml" />
                 <exclude name="documentation/resources/images/pb-poi.cdr"/>
-                <exclude name="scratchpad/models/poi-hdf.zargo"/>
-                <exclude name="integrationtest/build/**"/>
-                <exclude name="integrationtest/.ant-targets-build.xml" />
             </fileset>
         </rat:report>
 
@@ -2525,13 +2525,17 @@ under the License.
             <bundledsignatures name="jdk-system-out"/>
             -->
             <signaturesFileset file="src/resources/devtools/forbidden-signatures.txt"/>
-            <!-- test-sources (incl. sources) -->
-            <zipfileset src="build/dist/maven/poi-tests/poi-${version.id}-tests.jar"/>
-            <zipfileset src="build/dist/maven/poi-ooxml-tests/poi-ooxml-${version.id}-tests.jar"/>
-            <zipfileset src="build/dist/maven/poi-scratchpad-tests/poi-scratchpad-${version.id}-tests.jar"/>
-            <zipfileset src="build/dist/maven/poi-excelant-tests/poi-excelant-${version.id}-tests.jar"/>
-            <zipfileset src="build/dist/maven/poi-examples/poi-examples-${version.id}.jar"/>
-            <zipfileset src="build/dist/maven/poi-integration/poi-integration-${version.id}.jar"/>
+            <!-- use the plain test-/classes instead of the dist-zips, otherwise forbidden-apis is soo slow ... -->
+            <fileset dir="${main.output.dir}"/>
+            <fileset dir="${main.output.test.dir}"/>
+            <fileset dir="${scratchpad.output.dir}"/>
+            <fileset dir="${scratchpad.output.test.dir}"/>
+            <fileset dir="${examples.output.dir}"/>
+            <fileset dir="${ooxml.output.dir}"/>
+            <fileset dir="${ooxml.output.test.dir}"/>
+            <fileset dir="${excelant.output.dir}"/>
+            <fileset dir="${excelant.output.test.dir}"/>
+            <fileset dir="${integration.output.test.dir}"/>
         </forbiddenapis>
 
         <!-- then check some advanced rules which we only apply to the core code and not tests or examples -->
@@ -2542,11 +2546,11 @@ under the License.
             >
             <signaturesFileset file="src/resources/devtools/forbidden-signatures-prod.txt"/>
             <!-- sources -->
-            <zipfileset src="build/dist/maven/poi/poi-${version.id}.jar"/>
-            <zipfileset src="build/dist/maven/poi-ooxml/poi-ooxml-${version.id}.jar"/>
-            <zipfileset src="build/dist/maven/poi-scratchpad/poi-scratchpad-${version.id}.jar"/>
-            <zipfileset src="build/dist/maven/poi-excelant/poi-excelant-${version.id}.jar"/>
-            <zipfileset src="build/dist/maven/poi-integration/poi-integration-${version.id}.jar"/>
+            <fileset dir="${main.output.dir}"/>
+            <fileset dir="${ooxml.output.dir}"/>
+            <fileset dir="${scratchpad.output.dir}"/>
+            <fileset dir="${excelant.output.dir}"/>
+            <fileset dir="${integration.output.test.dir}"/>
         </forbiddenapis>
     </target>
 
@@ -2686,9 +2690,11 @@ under the License.
             <auxClasspath path="${pdf.pdfbox.jar}"/>
             <auxClasspath path="${pdf.fontbox.jar}"/>
             <auxClasspath path="${pdf.graphics2d.jar}"/>
-            <sourcePath path="src/java" />
-            <sourcePath path="src/ooxml/java" />
-            <sourcePath path="src/scratchpad/src" />
+            <sourcePath path="main/src/main/java" />
+            <sourcePath path="excelant/src/main/java" />
+            <sourcePath path="examples/src/main/java" />
+            <sourcePath path="ooxml/src/main/java" />
+            <sourcePath path="scratchpad/src/main/java" />
         </spotbugs>
 
         <!-- instead of calling findbugs again, we simply transform the xml -->
@@ -2914,7 +2920,7 @@ under the License.
             <format property="tstamp_next" pattern="yyyy-MM" offset="3" unit="month"/>
         </tstamp>
 
-        <taskdef name="NextRelease" classname="NextRelease" classpath="build/poi-ant-contrib"/>
+        <taskdef name="NextRelease" classname="NextRelease" classpath="excelant/build/poi-ant-contrib"/>
         <NextRelease property="rel_next"/>
 
         <antcall target="-update-build.xml">
@@ -3038,7 +3044,7 @@ under the License.
         </tstamp>
 
 
-        <taskdef name="NextRelease" classname="NextRelease" classpath="build/poi-ant-contrib"/>
+        <taskdef name="NextRelease" classname="NextRelease" classpath="excelant/build/poi-ant-contrib"/>
         <NextRelease property="rel_prev" increment="-1"/>
 
         <!-- we don't simply generate a new iso file date with tstamp,
@@ -3052,8 +3058,8 @@ under the License.
 
         <replaceregexp file="build.gradle" match="( +version += +)'[^']+'" replace="\1'${version.id}'"/>
         <replaceregexp file="build.gradle" match="(japicmpversion += +)'[^']+'" replace="\1'${rel_prev}'"/>
-        <replaceregexp file="src/examples/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
-        <replaceregexp file="src/examples/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
+        <replaceregexp file="examples/src/main/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
+        <replaceregexp file="examples/src/main/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
         <replaceregexp file="osgi/pom.xml" match="version>${rel_prev}[^&lt;]+" replace="version>${version.id}"/>
         <replaceregexp file="doap_POI.rdf" match="&lt;release&gt;" replace="&lt;release&gt;&#10;      &lt;Version&gt;&#10;        &lt;name&gt;Apache POI ${rel_prev}&lt;/name&gt;&#10;        &lt;created&gt;${file_date_iso}&lt;/created&gt;&#10;        &lt;revision&gt;${rel_prev}&lt;/revision&gt;&#10;      &lt;/Version&gt;&#10;    &lt;/release&gt;&#10;    &lt;release&gt;"/>
 
@@ -3141,7 +3147,7 @@ under the License.
                 </filterchain>
             </loadfile>
 
-            <taskdef name="bytes2mega" classname="Bytes2Mega" classpath="build/poi-ant-contrib"/>
+            <taskdef name="bytes2mega" classname="Bytes2Mega" classpath="excelant/build/poi-ant-contrib"/>
             <local name="fileSizeMb"/>
             <bytes2mega property="fileSizeMb" bytes="${fileSize}"/>
 
diff --git a/src/records/definitions/ftend_record.xml b/examples/build.gradle
index 45f9d59bfe..eb7855d990 100644
--- a/src/records/definitions/ftend_record.xml
+++ b/examples/build.gradle
@@ -1,6 +1,4 @@
-<?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.
@@ -15,14 +13,13 @@
    WITHOUT 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>
+==================================================================== */
+
+dependencies {
+    implementation project(':ooxml')
+    implementation project(':scratchpad')
+
+    implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+}
+
+japicmp.enabled = false
\ No newline at end of file
diff --git a/src/examples/clojure/SpreadSheetDemo.clj b/examples/src/main/clojure/SpreadSheetDemo.clj
index fbef7c991c..fbef7c991c 100644
--- a/src/examples/clojure/SpreadSheetDemo.clj
+++ b/examples/src/main/clojure/SpreadSheetDemo.clj
diff --git a/src/examples/groovy/SpreadSheetDemo.groovy b/examples/src/main/groovy/SpreadSheetDemo.groovy
index b9f30c0ce6..b9f30c0ce6 100644
--- a/src/examples/groovy/SpreadSheetDemo.groovy
+++ b/examples/src/main/groovy/SpreadSheetDemo.groovy
diff --git a/src/examples/groovy/build.gradle b/examples/src/main/groovy/build.gradle
index 79bccbcdeb..79bccbcdeb 100644
--- a/src/examples/groovy/build.gradle
+++ b/examples/src/main/groovy/build.gradle
diff --git a/src/examples/src/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java b/examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
index 406d6dc335..406d6dc335 100644
--- a/src/examples/src/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
+++ b/examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/CopyCompare.java b/examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
index c24afe1376..c24afe1376 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/CopyCompare.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
index cf26fee949..cf26fee949 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
index ca8cba1ce9..ca8cba1ce9 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/ReadTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java
index b901a89a3d..b901a89a3d 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/ReadTitle.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
index 94ceaf6c03..94ceaf6c03 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
diff --git a/src/examples/src/org/apache/poi/examples/hpsf/WriteTitle.java b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java
index a9a50cf8e4..a9a50cf8e4 100644
--- a/src/examples/src/org/apache/poi/examples/hpsf/WriteTitle.java
+++ b/examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/ApacheconEU08.java b/examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java
index 53d3c46077..53d3c46077 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/ApacheconEU08.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/BulletsDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java
index 5ab8b86a39..5ab8b86a39 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/BulletsDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/CreateHyperlink.java b/examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java
index be8a227d1a..be8a227d1a 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/CreateHyperlink.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/DataExtraction.java b/examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java
index 6996dc8751..6996dc8751 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/DataExtraction.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/Graphics2DDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java
index 938b52e6d2..938b52e6d2 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/Graphics2DDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/HeadersFootersDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java
index 4dd4349df5..4dd4349df5 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/HeadersFootersDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/Hyperlinks.java b/examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java
index 307178d0e0..307178d0e0 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/Hyperlinks.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/SoundFinder.java b/examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java
index 0f6929fee7..0f6929fee7 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/SoundFinder.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java
diff --git a/src/examples/src/org/apache/poi/examples/hslf/TableDemo.java b/examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java
index 561ec717ab..561ec717ab 100644
--- a/src/examples/src/org/apache/poi/examples/hslf/TableDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/hsmf/Msg2txt.java b/examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java
index 4ab88cf27a..4ab88cf27a 100644
--- a/src/examples/src/org/apache/poi/examples/hsmf/Msg2txt.java
+++ b/examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java b/examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
index 61764ee928..61764ee928 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java
index 129f9327da..129f9327da 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Alignment.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java
index 25affcb0f8..25affcb0f8 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Alignment.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/BigExample.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java
index f50391ade8..f50391ade8 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/BigExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Borders.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java
index fba3b33214..fba3b33214 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Borders.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellComments.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java
index 6b6434b3e1..6b6434b3e1 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellComments.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellTypes.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java
index 5ba1656ff1..5ba1656ff1 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CellTypes.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java
index 8994d6f17e..8994d6f17e 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
index b77e0d1474..b77e0d1474 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
index 149c908fac..149c908fac 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EventExample.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java
index 0e71406b58..0e71406b58 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/EventExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
index ca2a61e41e..ca2a61e41e 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
index f53065de94..f53065de94 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
index 96fa30a90f..96fa30a90f 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
index ae4a37ea13..ae4a37ea13 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/InCellLists.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java
index 76d0172f82..76d0172f82 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/InCellLists.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/MergedCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java
index 16114b2d63..16114b2d63 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/MergedCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
index 487668da10..487668da10 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewSheet.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java
index d2d8f31d0a..d2d8f31d0a 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewSheet.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
index 16c0e04de1..16c0e04de1 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
index 4603864d86..4603864d86 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
index eca55d4378..eca55d4378 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java
index 42f1b16fc3..42f1b16fc3 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/Outlines.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
index e36b7ad26c..e36b7ad26c 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
index db737cd5bb..db737cd5bb 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
index 54c3879e41..54c3879e41 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
index 0c87a335b3..0c87a335b3 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
diff --git a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
index e958489cf7..e958489cf7 100644
--- a/src/examples/src/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
+++ b/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
diff --git a/src/examples/src/org/apache/poi/examples/hwmf/ROP2Table.java b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java
index a6c0b64978..a6c0b64978 100644
--- a/src/examples/src/org/apache/poi/examples/hwmf/ROP2Table.java
+++ b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java
diff --git a/src/examples/src/org/apache/poi/examples/hwmf/ROP3Table.java b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java
index 2e680a0aa3..2e680a0aa3 100644
--- a/src/examples/src/org/apache/poi/examples/hwmf/ROP3Table.java
+++ b/examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java
diff --git a/src/examples/src/org/apache/poi/examples/hwpf/Word2Forrest.java b/examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
index 937da16a33..937da16a33 100644
--- a/src/examples/src/org/apache/poi/examples/hwpf/Word2Forrest.java
+++ b/examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/AddDimensionedImage.java b/examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
index 6e102038b6..6e102038b6 100644
--- a/src/examples/src/org/apache/poi/examples/ss/AddDimensionedImage.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/AligningCells.java b/examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java
index af86efc724..af86efc724 100644
--- a/src/examples/src/org/apache/poi/examples/ss/AligningCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/BusinessPlan.java b/examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java
index a4865a32a3..a4865a32a3 100644
--- a/src/examples/src/org/apache/poi/examples/ss/BusinessPlan.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/CalendarDemo.java b/examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java
index 9253153f9e..9253153f9e 100644
--- a/src/examples/src/org/apache/poi/examples/ss/CalendarDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java b/examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java
index 6997a9e8fa..6997a9e8fa 100644
--- a/src/examples/src/org/apache/poi/examples/ss/CellStyleDetails.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/ConditionalFormats.java b/examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
index 22eec9633a..22eec9633a 100644
--- a/src/examples/src/org/apache/poi/examples/ss/ConditionalFormats.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/DrawingBorders.java b/examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java
index f98d64b2c6..f98d64b2c6 100644
--- a/src/examples/src/org/apache/poi/examples/ss/DrawingBorders.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java b/examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java
index 069aef0ebe..069aef0ebe 100644
--- a/src/examples/src/org/apache/poi/examples/ss/ExcelComparator.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/LinkedDropDownLists.java b/examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
index 5cbc63be60..5cbc63be60 100644
--- a/src/examples/src/org/apache/poi/examples/ss/LinkedDropDownLists.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/LoadEmbedded.java b/examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
index 3c52ecf253..3c52ecf253 100644
--- a/src/examples/src/org/apache/poi/examples/ss/LoadEmbedded.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/LoanCalculator.java b/examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java
index 28d1c648f0..28d1c648f0 100644
--- a/src/examples/src/org/apache/poi/examples/ss/LoanCalculator.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/SSPerformanceTest.java b/examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
index c041509d45..c041509d45 100644
--- a/src/examples/src/org/apache/poi/examples/ss/SSPerformanceTest.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/TimesheetDemo.java b/examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java
index 77b55c826d..77b55c826d 100644
--- a/src/examples/src/org/apache/poi/examples/ss/TimesheetDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/ToCSV.java b/examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
index 91a603f676..91a603f676 100644
--- a/src/examples/src/org/apache/poi/examples/ss/ToCSV.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/CalculateMortgage.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java
index 2675df181b..2675df181b 100644
--- a/src/examples/src/org/apache/poi/examples/ss/formula/CalculateMortgage.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
index 4135c80904..4135c80904 100644
--- a/src/examples/src/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/SettingExternalFunction.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
index 49feb3f7aa..49feb3f7aa 100644
--- a/src/examples/src/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java b/examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
index 939fd9ab9d..939fd9ab9d 100644
--- a/src/examples/src/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/formula/mortgage-calculation.xls b/examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
index 4e71ba8e65..4e71ba8e65 100644
--- a/src/examples/src/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
+++ b/examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
index 4614a31031..4614a31031 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/HtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java
index 8747ad4c9d..8747ad4c9d 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/HtmlHelper.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java b/examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java
index 65c8878916..65c8878916 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/ToHtml.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java b/examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
index 40bd504818..40bd504818 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/excelStyle.css b/examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css
index f056123780..f056123780 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/excelStyle.css
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css
diff --git a/src/examples/src/org/apache/poi/examples/ss/html/package-info.java b/examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java
index 1b41376632..1b41376632 100644
--- a/src/examples/src/org/apache/poi/examples/ss/html/package-info.java
+++ b/examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java
diff --git a/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java b/examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
index 7d2d01b409..7d2d01b409 100644
--- a/src/examples/src/org/apache/poi/examples/util/TempFileUtils.java
+++ b/examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt b/examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
index 2d32c4d81b..2d32c4d81b 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
diff --git a/src/examples/src/org/apache/poi/examples/xslf/BarChartDemo.java b/examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
index 2c159fbb59..2c159fbb59 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/BarChartDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/ChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
index bdfc3ea498..bdfc3ea498 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/ChartFromScratch.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/DataExtraction.java b/examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java
index 40a7c7f0d9..40a7c7f0d9 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/DataExtraction.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
index 77a438967f..77a438967f 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java b/examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
index 9fcf312011..9fcf312011 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/LinkVideoToPptx.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/MergePresentations.java b/examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java
index 89ae0b1aa9..89ae0b1aa9 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/MergePresentations.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/PieChartDemo.java b/examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
index 5f3d6470c8..5f3d6470c8 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/PieChartDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial1.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java
index d1b4768a1c..d1b4768a1c 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial1.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial2.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java
index 78afd7015f..78afd7015f 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial2.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial3.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java
index 420605ee75..420605ee75 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial3.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial4.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java
index a39e9030d8..a39e9030d8 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial4.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial5.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java
index cc459a17bb..cc459a17bb 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial5.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial6.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java
index 1648e21acf..1648e21acf 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial6.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/Tutorial7.java b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java
index d617de8dbc..d617de8dbc 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/Tutorial7.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt
index 22c7b86ab8..22c7b86ab8 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-data.txt
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt
diff --git a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-template.pptx b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx
index e4d2613046..e4d2613046 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/bar-chart-template.pptx
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx
diff --git a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt
index 40b6959c2c..40b6959c2c 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-data.txt
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt
diff --git a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-template.pptx b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx
index 33d28e154c..33d28e154c 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/pie-chart-template.pptx
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx
diff --git a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step1.java b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java
index 2d384a8389..2d384a8389 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step1.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java
diff --git a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step2.java b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java
index 68fcf14f5c..68fcf14f5c 100644
--- a/src/examples/src/org/apache/poi/examples/xslf/tutorial/Step2.java
+++ b/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java
index d61b4adb38..d61b4adb38 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java
index 96ba25e396..96ba25e396 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java
index 627e0f7fb5..627e0f7fb5 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java
index 9c53c4ee0b..9c53c4ee0b 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/HybridStreaming.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
index f131e5b6e8..f131e5b6e8 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/Outlining.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java
index 6c29813edd..6c29813edd 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/streaming/Outlining.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java
index f991047db7..f991047db7 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/AligningCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java
index 17a92d3d8c..17a92d3d8c 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/AligningCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
index 32329f2c29..32329f2c29 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java
index 8c68fe87a7..8c68fe87a7 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BarChart.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java
index 574458f7be..574458f7be 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
index 28f2c48f27..28f2c48f27 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CellComments.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java
index eb5757779c..eb5757779c 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CellComments.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateCell.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java
index 36e93dec2f..36e93dec2f 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateCell.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
index 991dd2f71a..991dd2f71a 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
index 53951d0ebd..53951d0ebd 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateTable.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java
index 7e1d56ad00..7e1d56ad00 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateTable.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
index 03d88d67ef..03d88d67ef 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
index ebc04a4d33..ebc04a4d33 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
index b4af95c5ae..b4af95c5ae 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
index a80916148a..a80916148a 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
index baf462ce32..baf462ce32 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
index 389e87fd0b..389e87fd0b 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
index 946ae50fd4..946ae50fd4 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
index 519631960e..519631960e 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/IterateCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java
index 0b49927977..0b49927977 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/IterateCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LineChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java
index 724d3e2608..724d3e2608 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LineChart.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
index 6e376f0f56..6e376f0f56 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/MergingCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java
index 22695c53fe..22695c53fe 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/MergingCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
index 8064260dd8..8064260dd8 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/Outlining.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java
index 09f87cd5fa..09f87cd5fa 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/Outlining.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ScatterChart.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
index a5ce3c84ae..a5ce3c84ae 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
index ef6d9470c7..ef6d9470c7 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ShiftRows.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
index 92d1f4ce6d..92d1f4ce6d 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
index 4a8afee879..4a8afee879 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
index 9bb43f96fc..9bb43f96fc 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
index 5ffa54aab8..5ffa54aab8 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
index a40ae57f42..a40ae57f42 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
index a43c5125a3..a43c5125a3 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
index 555bc513d8..555bc513d8 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
diff --git a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
index 43376fa1f6..43376fa1f6 100644
--- a/src/examples/src/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
+++ b/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java
index d26907c30e..d26907c30e 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
index 39c9d0812e..39c9d0812e 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java
index 889ff30fb1..889ff30fb1 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
index 70d2b7e588..70d2b7e588 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
index 57515545cf..57515545cf 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
index 659f6b6f39..659f6b6f39 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java
index 1f996cfd1f..1f996cfd1f 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
index 4b9e51e1d1..4b9e51e1d1 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
index faf31b3ded..faf31b3ded 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt
index 22c7b86ab8..22c7b86ab8 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt
diff --git a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
index ddd57ef0a3..ddd57ef0a3 100644
--- a/src/examples/src/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
+++ b/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
diff --git a/src/multimodule/examples/java9/module-info.class b/examples/src/main/java9/module-info.class
index 7f1d82fc9e..7f1d82fc9e 100644
--- a/src/multimodule/examples/java9/module-info.class
+++ b/examples/src/main/java9/module-info.class
diff --git a/src/multimodule/examples/java9/module-info.java b/examples/src/main/java9/module-info.java
index 68b580e3ee..68b580e3ee 100644
--- a/src/multimodule/examples/java9/module-info.java
+++ b/examples/src/main/java9/module-info.java
diff --git a/src/examples/jsp/HSSFExample.jsp b/examples/src/main/jsp/HSSFExample.jsp
index 4dd0a4f4e5..4dd0a4f4e5 100644
--- a/src/examples/jsp/HSSFExample.jsp
+++ b/examples/src/main/jsp/HSSFExample.jsp
diff --git a/src/contrib/poi-ruby/Makefile b/examples/src/main/ruby/Makefile
index a298da3296..a298da3296 100644
--- a/src/contrib/poi-ruby/Makefile
+++ b/examples/src/main/ruby/Makefile
diff --git a/src/contrib/poi-ruby/Poi4R.i b/examples/src/main/ruby/Poi4R.i
index 2f72ce9948..2f72ce9948 100644
--- a/src/contrib/poi-ruby/Poi4R.i
+++ b/examples/src/main/ruby/Poi4R.i
diff --git a/src/contrib/poi-ruby/cpp/RubyIO.cpp b/examples/src/main/ruby/cpp/RubyIO.cpp
index d4a4638cf0..d4a4638cf0 100644
--- a/src/contrib/poi-ruby/cpp/RubyIO.cpp
+++ b/examples/src/main/ruby/cpp/RubyIO.cpp
diff --git a/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java b/examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java
index e23a0a7d39..e23a0a7d39 100644
--- a/src/contrib/poi-ruby/java/org/apache/poi/RubyOutputStream.java
+++ b/examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java
diff --git a/src/contrib/poi-ruby/tests/tc_base_tests.rb b/examples/src/main/ruby/tests/tc_base_tests.rb
index 33492c7ab7..33492c7ab7 100644
--- a/src/contrib/poi-ruby/tests/tc_base_tests.rb
+++ b/examples/src/main/ruby/tests/tc_base_tests.rb
diff --git a/src/contrib/poi-ruby/tests/tc_gc.rb b/examples/src/main/ruby/tests/tc_gc.rb
index 82c3c2b132..82c3c2b132 100644
--- a/src/contrib/poi-ruby/tests/tc_gc.rb
+++ b/examples/src/main/ruby/tests/tc_gc.rb
diff --git a/src/contrib/poi-ruby/tests/ts_all.rb b/examples/src/main/ruby/tests/ts_all.rb
index ef50ad5d6d..ef50ad5d6d 100644
--- a/src/contrib/poi-ruby/tests/ts_all.rb
+++ b/examples/src/main/ruby/tests/ts_all.rb
diff --git a/src/examples/scala/XSSFMain.scala b/examples/src/main/scala/XSSFMain.scala
index 3365c903ca..3365c903ca 100644
--- a/src/examples/scala/XSSFMain.scala
+++ b/examples/src/main/scala/XSSFMain.scala
diff --git a/src/examples/scala/build.sbt b/examples/src/main/scala/build.sbt
index 598dc28951..598dc28951 100644
--- a/src/examples/scala/build.sbt
+++ b/examples/src/main/scala/build.sbt
diff --git a/src/records/definitions/plot_area_record.xml b/excelant/build.gradle
index 300492a4cc..fb65866061 100644
--- a/src/records/definitions/plot_area_record.xml
+++ b/excelant/build.gradle
@@ -1,6 +1,4 @@
-<?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.
@@ -15,13 +13,20 @@
    WITHOUT 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>
+==================================================================== */
+
+dependencies {
+    api 'org.apache.ant:ant:1.10.9'
+
+    api project(':ooxml')
+
+    testImplementation project(path: ':main', configuration: 'tests')
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.excelant'
+    }
+}
+
+japicmp.baseline = "org.apache.poi:poi-excelant:${japicmpversion}@jar"
\ No newline at end of file
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
index eb446dfde6..eb446dfde6 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
index 75892aa738..75892aa738 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
index 0739ef5833..0739ef5833 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java
index e62f0623d9..e62f0623d9 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSet.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
index 2451a61e68..2451a61e68 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
index 8dc599b104..8dc599b104 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
index e1ab047fbf..e1ab047fbf 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
index 4fc7a80508..4fc7a80508 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTask.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
index 2fd45cab15..2fd45cab15 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntTest.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
index f96a01f996..f96a01f996 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java b/excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
index c8db7008d6..c8db7008d6 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
index 4eecd4faeb..4eecd4faeb 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
index ee3f443228..ee3f443228 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
diff --git a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
index 113f0390f7..113f0390f7 100644
--- a/src/excelant/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
+++ b/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
diff --git a/src/multimodule/excelant/java9/module-info.class b/excelant/src/main/java9/module-info.class
index 2d75c59c3f..2d75c59c3f 100644
--- a/src/multimodule/excelant/java9/module-info.class
+++ b/excelant/src/main/java9/module-info.class
diff --git a/src/multimodule/excelant/java9/module-info.java b/excelant/src/main/java9/module-info.java
index 43b64560a7..43b64560a7 100644
--- a/src/multimodule/excelant/java9/module-info.java
+++ b/excelant/src/main/java9/module-info.java
diff --git a/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml b/excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml
index af13cc649b..af13cc649b 100644
--- a/src/excelant/resources/org/apache/poi/ss/excelant/antlib.xml
+++ b/excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml
diff --git a/src/excelant/poi-ant-contrib/Bytes2Mega.java b/excelant/src/poi-ant-contrib/java/Bytes2Mega.java
index 3bdafe18f5..3bdafe18f5 100644
--- a/src/excelant/poi-ant-contrib/Bytes2Mega.java
+++ b/excelant/src/poi-ant-contrib/java/Bytes2Mega.java
diff --git a/src/excelant/poi-ant-contrib/Junit5Progress.java b/excelant/src/poi-ant-contrib/java/Junit5Progress.java
index 8e87ef064f..8e87ef064f 100644
--- a/src/excelant/poi-ant-contrib/Junit5Progress.java
+++ b/excelant/src/poi-ant-contrib/java/Junit5Progress.java
diff --git a/src/excelant/poi-ant-contrib/NextRelease.java b/excelant/src/poi-ant-contrib/java/NextRelease.java
index c0b6b3d864..c0b6b3d864 100644
--- a/src/excelant/poi-ant-contrib/NextRelease.java
+++ b/excelant/src/poi-ant-contrib/java/NextRelease.java
diff --git a/src/excelant/poi-ant-contrib/PropertyReset.java b/excelant/src/poi-ant-contrib/java/PropertyReset.java
index 4f569e67fd..4f569e67fd 100644
--- a/src/excelant/poi-ant-contrib/PropertyReset.java
+++ b/excelant/src/poi-ant-contrib/java/PropertyReset.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/CalculateMortgageFunction.java b/excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
index 73eb984db7..73eb984db7 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java b/excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
index 48086fc22d..48086fc22d 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java b/excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
index d6a3a74b7d..d6a3a74b7d 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
index 89e948aaa4..dbf096ca26 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestBuildFile.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
@@ -51,7 +51,7 @@ public class TestBuildFile {
 
     @BeforeEach
     void setUp() {
-        String filename = TestBuildFile.getDataDir() + "/../src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml";
+        String filename = TestBuildFile.getDataDir() + "/../excelant/src/test/resources/tests.xml";
         int logLevel = Project.MSG_DEBUG;
 
         logBuffer = new StringBuilder();
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
index 2902144fde..2902144fde 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java
index 42f6cd256c..42f6cd256c 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSet.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
index 45c4f53635..45c4f53635 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
index 52b580ac6f..52b580ac6f 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
index 16189f1d50..16189f1d50 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
index dcb044a2eb..dcb044a2eb 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
index 4f46084c6a..4f46084c6a 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
index 26e700fa8b..26e700fa8b 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
+++ b/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
diff --git a/src/multimodule/excelant/test9/module-info.class b/excelant/src/test/java9/module-info.class
index 815e1396a6..815e1396a6 100644
--- a/src/multimodule/excelant/test9/module-info.class
+++ b/excelant/src/test/java9/module-info.class
diff --git a/src/multimodule/excelant/test9/module-info.java b/excelant/src/test/java9/module-info.java
index a26d9bd04d..a26d9bd04d 100644
--- a/src/multimodule/excelant/test9/module-info.java
+++ b/excelant/src/test/java9/module-info.java
diff --git a/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml b/excelant/src/test/resources/tests.xml
index 0882195551..0882195551 100644
--- a/src/excelant/testcases/org/apache/poi/ss/excelant/tests.xml
+++ b/excelant/src/test/resources/tests.xml
diff --git a/src/records/definitions/units_record.xml b/integrationtest/build.gradle
index ff281265a3..0121e71626 100644
--- a/src/records/definitions/units_record.xml
+++ b/integrationtest/build.gradle
@@ -1,6 +1,4 @@
-<?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.
@@ -15,14 +13,27 @@
    WITHOUT 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>
+==================================================================== */
+
+dependencies {
+    testImplementation 'org.apache.ant:ant:1.10.9'
+
+    testImplementation project(':ooxml')
+    testImplementation project(':scratchpad')
+    testImplementation project(':examples')
+
+    testImplementation files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest'
+    }
+}
+
+test {
+    // exclude these from the normal test-run
+    exclude '**/*FileHandler.class'
+}
+
+japicmp.enabled = false
\ No newline at end of file
diff --git a/src/integrationtest/build.xml b/integrationtest/src/test/java/build.xml
index 263a3810c2..263a3810c2 100644
--- a/src/integrationtest/build.xml
+++ b/integrationtest/src/test/java/build.xml
diff --git a/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
index 01a4ebc82d..01a4ebc82d 100644
--- a/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java b/integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java
index 5d63d1f5a1..5d63d1f5a1 100644
--- a/src/integrationtest/org/apache/poi/stress/BaseIntegrationTest.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java
diff --git a/src/integrationtest/org/apache/poi/stress/ExcInfo.java b/integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java
index c9241cb0f7..c9241cb0f7 100644
--- a/src/integrationtest/org/apache/poi/stress/ExcInfo.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java
diff --git a/src/integrationtest/org/apache/poi/stress/FileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java
index 62e5d81ced..62e5d81ced 100644
--- a/src/integrationtest/org/apache/poi/stress/FileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/FileHandlerFactory.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java
index 8be52b35a6..8be52b35a6 100644
--- a/src/integrationtest/org/apache/poi/stress/FileHandlerFactory.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java
diff --git a/src/integrationtest/org/apache/poi/stress/FileHandlerKnown.java b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
index aa3c827f1f..aa3c827f1f 100644
--- a/src/integrationtest/org/apache/poi/stress/FileHandlerKnown.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
diff --git a/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java
index 1d2ca65d4c..1d2ca65d4c 100644
--- a/src/integrationtest/org/apache/poi/stress/HDGFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java
index 34cf9ee5b9..34cf9ee5b9 100644
--- a/src/integrationtest/org/apache/poi/stress/HMEFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
index 419840d696..419840d696 100644
--- a/src/integrationtest/org/apache/poi/stress/HPBFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
index 088f77ef45..088f77ef45 100644
--- a/src/integrationtest/org/apache/poi/stress/HPSFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
index fc82b6612d..fc82b6612d 100644
--- a/src/integrationtest/org/apache/poi/stress/HSLFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java
index 8a21781bc4..8a21781bc4 100644
--- a/src/integrationtest/org/apache/poi/stress/HSMFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java
index 9ee54b4790..9ee54b4790 100644
--- a/src/integrationtest/org/apache/poi/stress/HSSFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java
index da07a9b87b..da07a9b87b 100644
--- a/src/integrationtest/org/apache/poi/stress/HWPFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/HeapDump.java b/integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java
index 7928975f56..7928975f56 100644
--- a/src/integrationtest/org/apache/poi/stress/HeapDump.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java
diff --git a/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java
index c4f5485806..c4f5485806 100644
--- a/src/integrationtest/org/apache/poi/stress/OPCFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/OWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java
index 7ad20d0585..7ad20d0585 100644
--- a/src/integrationtest/org/apache/poi/stress/OWPFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
index b92f91f5f9..b92f91f5f9 100644
--- a/src/integrationtest/org/apache/poi/stress/POIFSFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
index 930c904a77..930c904a77 100644
--- a/src/integrationtest/org/apache/poi/stress/POIXMLDocumentHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java
index 9a1defbf21..9a1defbf21 100644
--- a/src/integrationtest/org/apache/poi/stress/SlideShowHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
index dcee603bf2..dcee603bf2 100644
--- a/src/integrationtest/org/apache/poi/stress/SpreadsheetHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/StressMap.java b/integrationtest/src/test/java/org/apache/poi/stress/StressMap.java
index f69fbfbf4f..f69fbfbf4f 100644
--- a/src/integrationtest/org/apache/poi/stress/StressMap.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/StressMap.java
diff --git a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java b/integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java
index 55777d12ee..55777d12ee 100644
--- a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java
diff --git a/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java
index d588e4b496..d588e4b496 100644
--- a/src/integrationtest/org/apache/poi/stress/XDGFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java
index 7a5aebd4c4..7a5aebd4c4 100644
--- a/src/integrationtest/org/apache/poi/stress/XSLFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/XSSFBFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
index 1bc23c49ed..1bc23c49ed 100644
--- a/src/integrationtest/org/apache/poi/stress/XSSFBFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
index beb3a8edf8..beb3a8edf8 100644
--- a/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
diff --git a/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java b/integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
index 0970d4fa1a..0970d4fa1a 100644
--- a/src/integrationtest/org/apache/poi/stress/XWPFFileHandler.java
+++ b/integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
diff --git a/src/multimodule/integration/java9/module-info.java b/integrationtest/src/test/java9/module-info.java
index 782edf74db..782edf74db 100644
--- a/src/multimodule/integration/java9/module-info.java
+++ b/integrationtest/src/test/java9/module-info.java
diff --git a/src/resources/integrationtest/log4j2-test.xml b/integrationtest/src/test/resources/log4j2-test.xml
index 637a19d420..637a19d420 100644
--- a/src/resources/integrationtest/log4j2-test.xml
+++ b/integrationtest/src/test/resources/log4j2-test.xml
diff --git a/main/build.gradle b/main/build.gradle
new file mode 100644
index 0000000000..5167b32cfe
--- /dev/null
+++ b/main/build.gradle
@@ -0,0 +1,50 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+dependencies {
+    implementation "commons-codec:commons-codec:${commonsCodecVersion}"
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+    implementation 'javax.activation:activation:1.1.1'
+    api 'com.zaxxer:SparseBitSet:1.2'
+
+    testImplementation 'org.reflections:reflections:0.9.12'
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.main'
+    }
+}
+
+// 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
+}
+
+japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
\ No newline at end of file
diff --git a/src/models/BlockClassDiagram.pgml b/main/models/BlockClassDiagram.pgml
index 11d979ad4e..11d979ad4e 100644
--- a/src/models/BlockClassDiagram.pgml
+++ b/main/models/BlockClassDiagram.pgml
diff --git a/src/models/HSSFOperationalUseCases.pgml b/main/models/HSSFOperationalUseCases.pgml
index fe331fdffd..fe331fdffd 100644
--- a/src/models/HSSFOperationalUseCases.pgml
+++ b/main/models/HSSFOperationalUseCases.pgml
diff --git a/src/models/HSSFSerializerClassDiagram.pgml b/main/models/HSSFSerializerClassDiagram.pgml
index 474a2bfb06..474a2bfb06 100644
--- a/src/models/HSSFSerializerClassDiagram.pgml
+++ b/main/models/HSSFSerializerClassDiagram.pgml
diff --git a/src/models/HSSFSerializerUseCases.pgml b/main/models/HSSFSerializerUseCases.pgml
index e7dfc3f10b..e7dfc3f10b 100644
--- a/src/models/HSSFSerializerUseCases.pgml
+++ b/main/models/HSSFSerializerUseCases.pgml
diff --git a/src/models/HSSFUseCases.pgml b/main/models/HSSFUseCases.pgml
index 0bca884080..0bca884080 100644
--- a/src/models/HSSFUseCases.pgml
+++ b/main/models/HSSFUseCases.pgml
diff --git a/src/models/POIFSAddDocument.pgml b/main/models/POIFSAddDocument.pgml
index 2117546230..2117546230 100644
--- a/src/models/POIFSAddDocument.pgml
+++ b/main/models/POIFSAddDocument.pgml
diff --git a/src/models/POIFSClassDiagram.pgml b/main/models/POIFSClassDiagram.pgml
index 0f20959a3d..0f20959a3d 100644
--- a/src/models/POIFSClassDiagram.pgml
+++ b/main/models/POIFSClassDiagram.pgml
diff --git a/src/models/POIFSInitialization.pgml b/main/models/POIFSInitialization.pgml
index 3c487567b5..3c487567b5 100644
--- a/src/models/POIFSInitialization.pgml
+++ b/main/models/POIFSInitialization.pgml
diff --git a/src/models/POIFSLifeCycle.pgml b/main/models/POIFSLifeCycle.pgml
index 88c4315881..88c4315881 100644
--- a/src/models/POIFSLifeCycle.pgml
+++ b/main/models/POIFSLifeCycle.pgml
diff --git a/src/models/POIFSPropertyTablePreWrite.pgml b/main/models/POIFSPropertyTablePreWrite.pgml
index dba9bb2e87..dba9bb2e87 100644
--- a/src/models/POIFSPropertyTablePreWrite.pgml
+++ b/main/models/POIFSPropertyTablePreWrite.pgml
diff --git a/src/models/POIFSRootPropertyPreWrite.pgml b/main/models/POIFSRootPropertyPreWrite.pgml
index 829e8d36d1..829e8d36d1 100644
--- a/src/models/POIFSRootPropertyPreWrite.pgml
+++ b/main/models/POIFSRootPropertyPreWrite.pgml
diff --git a/src/models/POIFSWriteFilesystem.pgml b/main/models/POIFSWriteFilesystem.pgml
index 1a0196527b..1a0196527b 100644
--- a/src/models/POIFSWriteFilesystem.pgml
+++ b/main/models/POIFSWriteFilesystem.pgml
diff --git a/src/models/POIUseCases.pgml b/main/models/POIUseCases.pgml
index ee5a002863..ee5a002863 100644
--- a/src/models/POIUseCases.pgml
+++ b/main/models/POIUseCases.pgml
diff --git a/src/models/PropertyTableClassDiagram.pgml b/main/models/PropertyTableClassDiagram.pgml
index de6ae19bbf..de6ae19bbf 100644
--- a/src/models/PropertyTableClassDiagram.pgml
+++ b/main/models/PropertyTableClassDiagram.pgml
diff --git a/src/models/analysismain.pgml b/main/models/analysismain.pgml
index 5e2ca17bd3..5e2ca17bd3 100644
--- a/src/models/analysismain.pgml
+++ b/main/models/analysismain.pgml
diff --git a/src/models/poi.argo b/main/models/poi.argo
index 80c189b5b3..80c189b5b3 100644
--- a/src/models/poi.argo
+++ b/main/models/poi.argo
diff --git a/src/models/poi.xmi b/main/models/poi.xmi
index 5feadacece..5feadacece 100644
--- a/src/models/poi.xmi
+++ b/main/models/poi.xmi
diff --git a/src/models/poifsAnalysisClasses.pgml b/main/models/poifsAnalysisClasses.pgml
index 91ae564329..91ae564329 100644
--- a/src/models/poifsAnalysisClasses.pgml
+++ b/main/models/poifsAnalysisClasses.pgml
diff --git a/src/models/projectmain.pgml b/main/models/projectmain.pgml
index e385871f91..e385871f91 100644
--- a/src/models/projectmain.pgml
+++ b/main/models/projectmain.pgml
diff --git a/src/models/readFileFromFilesystemSequenceDiagram.pgml b/main/models/readFileFromFilesystemSequenceDiagram.pgml
index e2af7401f3..e2af7401f3 100644
--- a/src/models/readFileFromFilesystemSequenceDiagram.pgml
+++ b/main/models/readFileFromFilesystemSequenceDiagram.pgml
diff --git a/src/models/readFileSystemDirectorySequenceDiagram.pgml b/main/models/readFileSystemDirectorySequenceDiagram.pgml
index 5456e960d3..5456e960d3 100644
--- a/src/models/readFileSystemDirectorySequenceDiagram.pgml
+++ b/main/models/readFileSystemDirectorySequenceDiagram.pgml
diff --git a/src/models/readFilesystemSequenceDiagram.pgml b/main/models/readFilesystemSequenceDiagram.pgml
index 5c72dad5a7..5c72dad5a7 100644
--- a/src/models/readFilesystemSequenceDiagram.pgml
+++ b/main/models/readFilesystemSequenceDiagram.pgml
diff --git a/src/models/utilClasses.pgml b/main/models/utilClasses.pgml
index d70dec548a..d70dec548a 100644
--- a/src/models/utilClasses.pgml
+++ b/main/models/utilClasses.pgml
diff --git a/src/models/writeFilesystemSequenceDiagram.pgml b/main/models/writeFilesystemSequenceDiagram.pgml
index fc5746c266..fc5746c266 100644
--- a/src/models/writeFilesystemSequenceDiagram.pgml
+++ b/main/models/writeFilesystemSequenceDiagram.pgml
diff --git a/src/java/org/apache/poi/EmptyFileException.java b/main/src/main/java/org/apache/poi/EmptyFileException.java
index 5abbcd0fe6..5abbcd0fe6 100644
--- a/src/java/org/apache/poi/EmptyFileException.java
+++ b/main/src/main/java/org/apache/poi/EmptyFileException.java
diff --git a/src/java/org/apache/poi/EncryptedDocumentException.java b/main/src/main/java/org/apache/poi/EncryptedDocumentException.java
index 4ac6123e4b..4ac6123e4b 100644
--- a/src/java/org/apache/poi/EncryptedDocumentException.java
+++ b/main/src/main/java/org/apache/poi/EncryptedDocumentException.java
diff --git a/src/java/org/apache/poi/OldFileFormatException.java b/main/src/main/java/org/apache/poi/OldFileFormatException.java
index 3c01f5459e..3c01f5459e 100644
--- a/src/java/org/apache/poi/OldFileFormatException.java
+++ b/main/src/main/java/org/apache/poi/OldFileFormatException.java
diff --git a/src/java/org/apache/poi/POIDocument.java b/main/src/main/java/org/apache/poi/POIDocument.java
index e2f613af64..e2f613af64 100644
--- a/src/java/org/apache/poi/POIDocument.java
+++ b/main/src/main/java/org/apache/poi/POIDocument.java
diff --git a/src/java/org/apache/poi/POIReadOnlyDocument.java b/main/src/main/java/org/apache/poi/POIReadOnlyDocument.java
index 5f250704db..5f250704db 100644
--- a/src/java/org/apache/poi/POIReadOnlyDocument.java
+++ b/main/src/main/java/org/apache/poi/POIReadOnlyDocument.java
diff --git a/src/java/org/apache/poi/UnsupportedFileFormatException.java b/main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java
index b893639514..b893639514 100644
--- a/src/java/org/apache/poi/UnsupportedFileFormatException.java
+++ b/main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java
diff --git a/src/java/org/apache/poi/common/Duplicatable.java b/main/src/main/java/org/apache/poi/common/Duplicatable.java
index d9a9eebca0..d9a9eebca0 100644
--- a/src/java/org/apache/poi/common/Duplicatable.java
+++ b/main/src/main/java/org/apache/poi/common/Duplicatable.java
diff --git a/src/java/org/apache/poi/common/usermodel/GenericRecord.java b/main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java
index 046d07610e..046d07610e 100644
--- a/src/java/org/apache/poi/common/usermodel/GenericRecord.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java
diff --git a/src/java/org/apache/poi/common/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java
index 708f08df5d..708f08df5d 100644
--- a/src/java/org/apache/poi/common/usermodel/Hyperlink.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java
diff --git a/src/java/org/apache/poi/common/usermodel/HyperlinkType.java b/main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java
index 74fa7b6e5f..74fa7b6e5f 100644
--- a/src/java/org/apache/poi/common/usermodel/HyperlinkType.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java
diff --git a/src/java/org/apache/poi/common/usermodel/PictureType.java b/main/src/main/java/org/apache/poi/common/usermodel/PictureType.java
index d3ed67fc2e..d3ed67fc2e 100644
--- a/src/java/org/apache/poi/common/usermodel/PictureType.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/PictureType.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontCharset.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
index 044765738f..044765738f 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontFacet.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
index 5fb16908cd..5fb16908cd 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontFamily.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
index b627e10af8..b627e10af8 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontGroup.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
index cdbaefe90f..cdbaefe90f 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontHeader.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
index 2589b16f17..2589b16f17 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontInfo.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
index b47b02e53b..b47b02e53b 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
diff --git a/src/java/org/apache/poi/common/usermodel/fonts/FontPitch.java b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
index 5d1d48e63e..5d1d48e63e 100644
--- a/src/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
+++ b/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
diff --git a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
index 1fdf63380e..1fdf63380e 100644
--- a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
diff --git a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
index 249e74cb2e..249e74cb2e 100644
--- a/src/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
+++ b/main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
diff --git a/src/java/org/apache/poi/ddf/EscherArrayProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
index f2c555496e..f2c555496e 100644
--- a/src/java/org/apache/poi/ddf/EscherArrayProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherBSERecord.java b/main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java
index 08f3a0c694..08f3a0c694 100644
--- a/src/java/org/apache/poi/ddf/EscherBSERecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherBitmapBlip.java b/main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java
index f6d8aea45a..f6d8aea45a 100644
--- a/src/java/org/apache/poi/ddf/EscherBitmapBlip.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java
diff --git a/src/java/org/apache/poi/ddf/EscherBlipRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java
index c9e6d73e5c..c9e6d73e5c 100644
--- a/src/java/org/apache/poi/ddf/EscherBlipRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherBoolProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java
index d4d4062c8c..d4d4062c8c 100644
--- a/src/java/org/apache/poi/ddf/EscherBoolProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
index bf15c83047..bf15c83047 100644
--- a/src/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
index 5d182da247..5d182da247 100644
--- a/src/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherClientDataRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java
index 80f4f9e7e4..80f4f9e7e4 100644
--- a/src/java/org/apache/poi/ddf/EscherClientDataRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherColorRef.java b/main/src/main/java/org/apache/poi/ddf/EscherColorRef.java
index 0603329b18..0603329b18 100644
--- a/src/java/org/apache/poi/ddf/EscherColorRef.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherColorRef.java
diff --git a/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java
index 1f33cd735a..1f33cd735a 100644
--- a/src/java/org/apache/poi/ddf/EscherComplexProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherContainerRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
index bbe7efac65..bbe7efac65 100644
--- a/src/java/org/apache/poi/ddf/EscherContainerRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherDgRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java
index b290b3cf64..b290b3cf64 100644
--- a/src/java/org/apache/poi/ddf/EscherDgRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherDggRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java
index b4705ad383..b4705ad383 100644
--- a/src/java/org/apache/poi/ddf/EscherDggRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherDump.java b/main/src/main/java/org/apache/poi/ddf/EscherDump.java
index 489b143eac..489b143eac 100644
--- a/src/java/org/apache/poi/ddf/EscherDump.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherDump.java
diff --git a/src/java/org/apache/poi/ddf/EscherMetafileBlip.java b/main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
index 6713b5fc17..6713b5fc17 100644
--- a/src/java/org/apache/poi/ddf/EscherMetafileBlip.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
diff --git a/src/java/org/apache/poi/ddf/EscherOptRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java
index 7d88fcdced..7d88fcdced 100644
--- a/src/java/org/apache/poi/ddf/EscherOptRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherProperty.java
index 63a738cec1..63a738cec1 100644
--- a/src/java/org/apache/poi/ddf/EscherProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherPropertyFactory.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java
index eff992c952..eff992c952 100644
--- a/src/java/org/apache/poi/ddf/EscherPropertyFactory.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java
diff --git a/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java
index 99f5f6cb34..99f5f6cb34 100644
--- a/src/java/org/apache/poi/ddf/EscherPropertyMetaData.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java
diff --git a/src/java/org/apache/poi/ddf/EscherPropertyTypes.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java
index a48972faf3..a48972faf3 100644
--- a/src/java/org/apache/poi/ddf/EscherPropertyTypes.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java
diff --git a/src/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
index 52760e8665..52760e8665 100644
--- a/src/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
diff --git a/src/java/org/apache/poi/ddf/EscherRGBProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java
index 2662fb8b6b..2662fb8b6b 100644
--- a/src/java/org/apache/poi/ddf/EscherRGBProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherRecord.java
index 85ebea3740..85ebea3740 100644
--- a/src/java/org/apache/poi/ddf/EscherRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherRecordFactory.java b/main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java
index 401bbd08c3..401bbd08c3 100644
--- a/src/java/org/apache/poi/ddf/EscherRecordFactory.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java
diff --git a/src/java/org/apache/poi/ddf/EscherRecordTypes.java b/main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java
index c65169e001..c65169e001 100644
--- a/src/java/org/apache/poi/ddf/EscherRecordTypes.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java
diff --git a/src/java/org/apache/poi/ddf/EscherSerializationListener.java b/main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java
index dcc5eeeb80..dcc5eeeb80 100644
--- a/src/java/org/apache/poi/ddf/EscherSerializationListener.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java
diff --git a/src/java/org/apache/poi/ddf/EscherShapePathProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java
index 0d0f422155..0d0f422155 100644
--- a/src/java/org/apache/poi/ddf/EscherShapePathProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherSimpleProperty.java b/main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java
index 592d038fcf..592d038fcf 100644
--- a/src/java/org/apache/poi/ddf/EscherSimpleProperty.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java
diff --git a/src/java/org/apache/poi/ddf/EscherSpRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java
index acec08ed32..acec08ed32 100644
--- a/src/java/org/apache/poi/ddf/EscherSpRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherSpgrRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java
index eb98b8004a..eb98b8004a 100644
--- a/src/java/org/apache/poi/ddf/EscherSpgrRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
index aba46546c8..aba46546c8 100644
--- a/src/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
index 28b7ca74fa..28b7ca74fa 100644
--- a/src/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
diff --git a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java b/main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java
index dced174318..dced174318 100644
--- a/src/java/org/apache/poi/ddf/EscherTextboxRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java
diff --git a/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java b/main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java
index 28a8c94a6b..28a8c94a6b 100644
--- a/src/java/org/apache/poi/ddf/NullEscherSerializationListener.java
+++ b/main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java
diff --git a/src/java/org/apache/poi/ddf/UnknownEscherRecord.java b/main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java
index 83de70c836..83de70c836 100644
--- a/src/java/org/apache/poi/ddf/UnknownEscherRecord.java
+++ b/main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java
diff --git a/src/java/org/apache/poi/ddf/package-info.java b/main/src/main/java/org/apache/poi/ddf/package-info.java
index b748cf8175..b748cf8175 100644
--- a/src/java/org/apache/poi/ddf/package-info.java
+++ b/main/src/main/java/org/apache/poi/ddf/package-info.java
diff --git a/src/java/org/apache/poi/extractor/ExtractorFactory.java b/main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
index a8d2f2d492..a8d2f2d492 100644
--- a/src/java/org/apache/poi/extractor/ExtractorFactory.java
+++ b/main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
diff --git a/src/java/org/apache/poi/extractor/ExtractorProvider.java b/main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java
index 5669cd9fe7..5669cd9fe7 100644
--- a/src/java/org/apache/poi/extractor/ExtractorProvider.java
+++ b/main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java
diff --git a/src/java/org/apache/poi/extractor/MainExtractorFactory.java b/main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java
index d485f864ff..d485f864ff 100644
--- a/src/java/org/apache/poi/extractor/MainExtractorFactory.java
+++ b/main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java
diff --git a/src/java/org/apache/poi/extractor/POIOLE2TextExtractor.java b/main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
index a389b71d0c..a389b71d0c 100644
--- a/src/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
+++ b/main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
diff --git a/src/java/org/apache/poi/extractor/POITextExtractor.java b/main/src/main/java/org/apache/poi/extractor/POITextExtractor.java
index cf88c57bae..cf88c57bae 100644
--- a/src/java/org/apache/poi/extractor/POITextExtractor.java
+++ b/main/src/main/java/org/apache/poi/extractor/POITextExtractor.java
diff --git a/src/java/org/apache/poi/hpsf/Array.java b/main/src/main/java/org/apache/poi/hpsf/Array.java
index 94af1369f8..94af1369f8 100644
--- a/src/java/org/apache/poi/hpsf/Array.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Array.java
diff --git a/src/java/org/apache/poi/hpsf/Blob.java b/main/src/main/java/org/apache/poi/hpsf/Blob.java
index 6c6e17c660..6c6e17c660 100644
--- a/src/java/org/apache/poi/hpsf/Blob.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Blob.java
diff --git a/src/java/org/apache/poi/hpsf/ClassID.java b/main/src/main/java/org/apache/poi/hpsf/ClassID.java
index 42a960a4c7..42a960a4c7 100644
--- a/src/java/org/apache/poi/hpsf/ClassID.java
+++ b/main/src/main/java/org/apache/poi/hpsf/ClassID.java
diff --git a/src/java/org/apache/poi/hpsf/ClassIDPredefined.java b/main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java
index 61d6566c66..61d6566c66 100644
--- a/src/java/org/apache/poi/hpsf/ClassIDPredefined.java
+++ b/main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java
diff --git a/src/java/org/apache/poi/hpsf/ClipboardData.java b/main/src/main/java/org/apache/poi/hpsf/ClipboardData.java
index d92269a785..d92269a785 100644
--- a/src/java/org/apache/poi/hpsf/ClipboardData.java
+++ b/main/src/main/java/org/apache/poi/hpsf/ClipboardData.java
diff --git a/src/java/org/apache/poi/hpsf/CodePageString.java b/main/src/main/java/org/apache/poi/hpsf/CodePageString.java
index 4ba9b0d063..4ba9b0d063 100644
--- a/src/java/org/apache/poi/hpsf/CodePageString.java
+++ b/main/src/main/java/org/apache/poi/hpsf/CodePageString.java
diff --git a/src/java/org/apache/poi/hpsf/Currency.java b/main/src/main/java/org/apache/poi/hpsf/Currency.java
index 974887efcb..974887efcb 100644
--- a/src/java/org/apache/poi/hpsf/Currency.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Currency.java
diff --git a/src/java/org/apache/poi/hpsf/CustomProperties.java b/main/src/main/java/org/apache/poi/hpsf/CustomProperties.java
index fa49246e80..fa49246e80 100644
--- a/src/java/org/apache/poi/hpsf/CustomProperties.java
+++ b/main/src/main/java/org/apache/poi/hpsf/CustomProperties.java
diff --git a/src/java/org/apache/poi/hpsf/CustomProperty.java b/main/src/main/java/org/apache/poi/hpsf/CustomProperty.java
index 60b5dc5da3..60b5dc5da3 100644
--- a/src/java/org/apache/poi/hpsf/CustomProperty.java
+++ b/main/src/main/java/org/apache/poi/hpsf/CustomProperty.java
diff --git a/src/java/org/apache/poi/hpsf/Date.java b/main/src/main/java/org/apache/poi/hpsf/Date.java
index 984661ca37..984661ca37 100644
--- a/src/java/org/apache/poi/hpsf/Date.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Date.java
diff --git a/src/java/org/apache/poi/hpsf/Decimal.java b/main/src/main/java/org/apache/poi/hpsf/Decimal.java
index 608d8c21bb..608d8c21bb 100644
--- a/src/java/org/apache/poi/hpsf/Decimal.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Decimal.java
diff --git a/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java b/main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
index 07c09a7579..07c09a7579 100644
--- a/src/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
+++ b/main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
diff --git a/src/java/org/apache/poi/hpsf/Filetime.java b/main/src/main/java/org/apache/poi/hpsf/Filetime.java
index 98b2c27c6c..98b2c27c6c 100644
--- a/src/java/org/apache/poi/hpsf/Filetime.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Filetime.java
diff --git a/src/java/org/apache/poi/hpsf/GUID.java b/main/src/main/java/org/apache/poi/hpsf/GUID.java
index a140a9cc46..a140a9cc46 100644
--- a/src/java/org/apache/poi/hpsf/GUID.java
+++ b/main/src/main/java/org/apache/poi/hpsf/GUID.java
diff --git a/src/java/org/apache/poi/hpsf/HPSFException.java b/main/src/main/java/org/apache/poi/hpsf/HPSFException.java
index abc3b8d9f7..abc3b8d9f7 100644
--- a/src/java/org/apache/poi/hpsf/HPSFException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/HPSFException.java
diff --git a/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java b/main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
index a0a5d68fb8..a0a5d68fb8 100644
--- a/src/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
+++ b/main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
diff --git a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java
index 984a316fc2..984a316fc2 100644
--- a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java
diff --git a/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java b/main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
index 3217af9580..3217af9580 100644
--- a/src/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
diff --git a/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
index b71ff47032..b71ff47032 100644
--- a/src/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
diff --git a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java b/main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java
index f5bfc2aeab..f5bfc2aeab 100644
--- a/src/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ b/main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java
diff --git a/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java b/main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java
index 450c892abc..450c892abc 100644
--- a/src/java/org/apache/poi/hpsf/MarkUnsupportedException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java
diff --git a/src/java/org/apache/poi/hpsf/MissingSectionException.java b/main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java
index f3e81cad29..f3e81cad29 100644
--- a/src/java/org/apache/poi/hpsf/MissingSectionException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java
diff --git a/src/java/org/apache/poi/hpsf/NoFormatIDException.java b/main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java
index 51f76c3486..51f76c3486 100644
--- a/src/java/org/apache/poi/hpsf/NoFormatIDException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java
diff --git a/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java b/main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
index 62738d42b4..62738d42b4 100644
--- a/src/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
diff --git a/src/java/org/apache/poi/hpsf/NoSingleSectionException.java b/main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java
index 2309fe5612..2309fe5612 100644
--- a/src/java/org/apache/poi/hpsf/NoSingleSectionException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java
diff --git a/src/java/org/apache/poi/hpsf/Property.java b/main/src/main/java/org/apache/poi/hpsf/Property.java
index 0e3e2cdea2..0e3e2cdea2 100644
--- a/src/java/org/apache/poi/hpsf/Property.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Property.java
diff --git a/src/java/org/apache/poi/hpsf/PropertySet.java b/main/src/main/java/org/apache/poi/hpsf/PropertySet.java
index d110747d11..d110747d11 100644
--- a/src/java/org/apache/poi/hpsf/PropertySet.java
+++ b/main/src/main/java/org/apache/poi/hpsf/PropertySet.java
diff --git a/src/java/org/apache/poi/hpsf/PropertySetFactory.java b/main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
index d5e0c5c0c2..d5e0c5c0c2 100644
--- a/src/java/org/apache/poi/hpsf/PropertySetFactory.java
+++ b/main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
diff --git a/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java b/main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
index cb16058a78..cb16058a78 100644
--- a/src/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
diff --git a/src/java/org/apache/poi/hpsf/Section.java b/main/src/main/java/org/apache/poi/hpsf/Section.java
index c404e49858..c404e49858 100644
--- a/src/java/org/apache/poi/hpsf/Section.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Section.java
diff --git a/src/java/org/apache/poi/hpsf/SummaryInformation.java b/main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java
index 4c85b8fda8..4c85b8fda8 100644
--- a/src/java/org/apache/poi/hpsf/SummaryInformation.java
+++ b/main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java
diff --git a/src/java/org/apache/poi/hpsf/Thumbnail.java b/main/src/main/java/org/apache/poi/hpsf/Thumbnail.java
index 66f5f178fa..66f5f178fa 100644
--- a/src/java/org/apache/poi/hpsf/Thumbnail.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Thumbnail.java
diff --git a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java b/main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
index 1b4f5c6489..1b4f5c6489 100644
--- a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java
+++ b/main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
diff --git a/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java b/main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
index 54efe0f44a..54efe0f44a 100644
--- a/src/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
diff --git a/src/java/org/apache/poi/hpsf/UnicodeString.java b/main/src/main/java/org/apache/poi/hpsf/UnicodeString.java
index 866a2b2acd..866a2b2acd 100644
--- a/src/java/org/apache/poi/hpsf/UnicodeString.java
+++ b/main/src/main/java/org/apache/poi/hpsf/UnicodeString.java
diff --git a/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
index 12afdcb4cb..12afdcb4cb 100644
--- a/src/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
diff --git a/src/java/org/apache/poi/hpsf/Variant.java b/main/src/main/java/org/apache/poi/hpsf/Variant.java
index f7b541b101..f7b541b101 100644
--- a/src/java/org/apache/poi/hpsf/Variant.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Variant.java
diff --git a/src/java/org/apache/poi/hpsf/VariantBool.java b/main/src/main/java/org/apache/poi/hpsf/VariantBool.java
index 0f59164688..0f59164688 100644
--- a/src/java/org/apache/poi/hpsf/VariantBool.java
+++ b/main/src/main/java/org/apache/poi/hpsf/VariantBool.java
diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/main/src/main/java/org/apache/poi/hpsf/VariantSupport.java
index 5d49c8a28e..5d49c8a28e 100644
--- a/src/java/org/apache/poi/hpsf/VariantSupport.java
+++ b/main/src/main/java/org/apache/poi/hpsf/VariantSupport.java
diff --git a/src/java/org/apache/poi/hpsf/VariantTypeException.java b/main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java
index c2d2e8f66f..c2d2e8f66f 100644
--- a/src/java/org/apache/poi/hpsf/VariantTypeException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java
diff --git a/src/java/org/apache/poi/hpsf/Vector.java b/main/src/main/java/org/apache/poi/hpsf/Vector.java
index 465eabd829..465eabd829 100644
--- a/src/java/org/apache/poi/hpsf/Vector.java
+++ b/main/src/main/java/org/apache/poi/hpsf/Vector.java
diff --git a/src/java/org/apache/poi/hpsf/VersionedStream.java b/main/src/main/java/org/apache/poi/hpsf/VersionedStream.java
index 20d2d133a4..20d2d133a4 100644
--- a/src/java/org/apache/poi/hpsf/VersionedStream.java
+++ b/main/src/main/java/org/apache/poi/hpsf/VersionedStream.java
diff --git a/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java b/main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java
index d409999f78..d409999f78 100644
--- a/src/java/org/apache/poi/hpsf/WritingNotSupportedException.java
+++ b/main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java
diff --git a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
index fde938d258..fde938d258 100644
--- a/src/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
+++ b/main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
diff --git a/src/java/org/apache/poi/hpsf/package-info.java b/main/src/main/java/org/apache/poi/hpsf/package-info.java
index a07740c96f..a07740c96f 100644
--- a/src/java/org/apache/poi/hpsf/package-info.java
+++ b/main/src/main/java/org/apache/poi/hpsf/package-info.java
diff --git a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
index 6443c8c831..6443c8c831 100644
--- a/src/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
+++ b/main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
diff --git a/src/java/org/apache/poi/hpsf/wellknown/package-info.java b/main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java
index db9fae9b81..db9fae9b81 100644
--- a/src/java/org/apache/poi/hpsf/wellknown/package-info.java
+++ b/main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java
diff --git a/src/java/org/apache/poi/hssf/OldExcelFormatException.java b/main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java
index e42e613d84..e42e613d84 100644
--- a/src/java/org/apache/poi/hssf/OldExcelFormatException.java
+++ b/main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java
diff --git a/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java b/main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
index 3fc3f5d3be..3fc3f5d3be 100644
--- a/src/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java
index 10d59c869c..10d59c869c 100644
--- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java
diff --git a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java
index 6e01e09f7b..6e01e09f7b 100644
--- a/src/java/org/apache/poi/hssf/dev/EFBiffViewer.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java
diff --git a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java b/main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java
index bc7cc9cc84..bc7cc9cc84 100644
--- a/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java
diff --git a/src/java/org/apache/poi/hssf/dev/ReSave.java b/main/src/main/java/org/apache/poi/hssf/dev/ReSave.java
index 2f31eb48d8..2f31eb48d8 100644
--- a/src/java/org/apache/poi/hssf/dev/ReSave.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/ReSave.java
diff --git a/src/java/org/apache/poi/hssf/dev/RecordLister.java b/main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java
index fd6c8ef111..fd6c8ef111 100644
--- a/src/java/org/apache/poi/hssf/dev/RecordLister.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java
diff --git a/src/java/org/apache/poi/hssf/dev/package-info.java b/main/src/main/java/org/apache/poi/hssf/dev/package-info.java
index 74d4c09c9b..74d4c09c9b 100644
--- a/src/java/org/apache/poi/hssf/dev/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/dev/package-info.java
diff --git a/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java b/main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java
index 1924b476ba..1924b476ba 100644
--- a/src/java/org/apache/poi/hssf/eventmodel/ERFListener.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java
diff --git a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
index 9cc6791c5f..9cc6791c5f 100644
--- a/src/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
index 08e9c4f72a..08e9c4f72a 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
index 0ef80530c0..0ef80530c0 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
index fcd4cdd2a3..fcd4cdd2a3 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
index 65c0c83115..65c0c83115 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
index cc47e416b0..cc47e416b0 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
index 50cc728e95..50cc728e95 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
index a104c253c6..a104c253c6 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
index 83c7a18cac..83c7a18cac 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
index 008decd122..008decd122 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
index b22dfd7cc7..b22dfd7cc7 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
index 5b799855c2..5b799855c2 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
index 7c13c48093..7c13c48093 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
diff --git a/src/java/org/apache/poi/hssf/eventusermodel/package-info.java b/main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java
index 69b02c4daf..69b02c4daf 100644
--- a/src/java/org/apache/poi/hssf/eventusermodel/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java
diff --git a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
index a3239def70..a3239def70 100644
--- a/src/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
+++ b/main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
diff --git a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
index 5fa855546f..5fa855546f 100644
--- a/src/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
+++ b/main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
diff --git a/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java b/main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
index e6a55f88ff..e6a55f88ff 100644
--- a/src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
+++ b/main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
diff --git a/src/java/org/apache/poi/hssf/model/ConvertAnchor.java b/main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java
index 60808e797a..60808e797a 100644
--- a/src/java/org/apache/poi/hssf/model/ConvertAnchor.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java
diff --git a/src/java/org/apache/poi/hssf/model/DrawingManager2.java b/main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java
index 7502b4aee9..7502b4aee9 100644
--- a/src/java/org/apache/poi/hssf/model/DrawingManager2.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java
diff --git a/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java b/main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
index e2ed227155..e2ed227155 100644
--- a/src/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
diff --git a/src/java/org/apache/poi/hssf/model/InternalSheet.java b/main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
index e1a96e15ce..e1a96e15ce 100644
--- a/src/java/org/apache/poi/hssf/model/InternalSheet.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
diff --git a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java b/main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java
index 95e156618b..95e156618b 100644
--- a/src/java/org/apache/poi/hssf/model/InternalWorkbook.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java
diff --git a/src/java/org/apache/poi/hssf/model/LinkTable.java b/main/src/main/java/org/apache/poi/hssf/model/LinkTable.java
index a1fdb089c4..a1fdb089c4 100644
--- a/src/java/org/apache/poi/hssf/model/LinkTable.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/LinkTable.java
diff --git a/src/java/org/apache/poi/hssf/model/RecordOrderer.java b/main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java
index f1dd369a91..f1dd369a91 100644
--- a/src/java/org/apache/poi/hssf/model/RecordOrderer.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java
diff --git a/src/java/org/apache/poi/hssf/model/RecordStream.java b/main/src/main/java/org/apache/poi/hssf/model/RecordStream.java
index 02d85fda6a..02d85fda6a 100644
--- a/src/java/org/apache/poi/hssf/model/RecordStream.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/RecordStream.java
diff --git a/src/java/org/apache/poi/hssf/model/RowBlocksReader.java b/main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java
index efad9d5a86..efad9d5a86 100644
--- a/src/java/org/apache/poi/hssf/model/RowBlocksReader.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java
diff --git a/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java b/main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java
index 2f97ed0163..2f97ed0163 100644
--- a/src/java/org/apache/poi/hssf/model/WorkbookRecordList.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java
diff --git a/src/java/org/apache/poi/hssf/model/package-info.java b/main/src/main/java/org/apache/poi/hssf/model/package-info.java
index b2e8ffcc2d..b2e8ffcc2d 100644
--- a/src/java/org/apache/poi/hssf/model/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/model/package-info.java
diff --git a/src/java/org/apache/poi/hssf/package-info.java b/main/src/main/java/org/apache/poi/hssf/package-info.java
index 43f8bcbe65..43f8bcbe65 100644
--- a/src/java/org/apache/poi/hssf/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/package-info.java
diff --git a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
index 0132e276e3..0132e276e3 100644
--- a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ArrayRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java
index b3e2d7f234..b3e2d7f234 100644
--- a/src/java/org/apache/poi/hssf/record/ArrayRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
index cd981f73c8..cd981f73c8 100644
--- a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BOFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java
index 5f081c1bac..5f081c1bac 100644
--- a/src/java/org/apache/poi/hssf/record/BOFRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BackupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java
index 32e485cfbc..32e485cfbc 100644
--- a/src/java/org/apache/poi/hssf/record/BackupRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java b/main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java
index 089dce6755..089dce6755 100644
--- a/src/java/org/apache/poi/hssf/record/BiffHeaderInput.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java
diff --git a/src/java/org/apache/poi/hssf/record/BlankRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java
index 8b0f54ca37..8b0f54ca37 100644
--- a/src/java/org/apache/poi/hssf/record/BlankRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BookBoolRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java
index db57a64616..db57a64616 100644
--- a/src/java/org/apache/poi/hssf/record/BookBoolRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java
index 94266db621..94266db621 100644
--- a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java
index 8ef05a56df..8ef05a56df 100644
--- a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java
index 0640640f7e..0640640f7e 100644
--- a/src/java/org/apache/poi/hssf/record/BoundSheetRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java
index 217ed37157..217ed37157 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java
diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java
index 0e4c41396c..0e4c41396c 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java
diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index fc837d1afb..fc837d1afb 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java
index e1a3fc5883..e1a3fc5883 100644
--- a/src/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java
diff --git a/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java
index 22ee40f54a..22ee40f54a 100644
--- a/src/java/org/apache/poi/hssf/record/CFRuleBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java
diff --git a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java
index c685da52fa..c685da52fa 100644
--- a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CRNCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java
index eb7d3f607d..eb7d3f607d 100644
--- a/src/java/org/apache/poi/hssf/record/CRNCountRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CRNRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java
index dc52d0b19a..dc52d0b19a 100644
--- a/src/java/org/apache/poi/hssf/record/CRNRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java
index 3fec4a9b43..3fec4a9b43 100644
--- a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java
index 1cac3134ac..1cac3134ac 100644
--- a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CellRecord.java
index d3c8bdb6a0..d3c8bdb6a0 100644
--- a/src/java/org/apache/poi/hssf/record/CellRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CellRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java b/main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
index c91a400d6a..c91a400d6a 100644
--- a/src/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
diff --git a/src/java/org/apache/poi/hssf/record/CodepageRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java
index e37a42d346..e37a42d346 100644
--- a/src/java/org/apache/poi/hssf/record/CodepageRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
index 6cbdc79691..6cbdc79691 100644
--- a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
index 14d7c2f1f5..14d7c2f1f5 100644
--- a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java
index 0b44be5857..0b44be5857 100644
--- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/CountryRecord.java b/main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java
index edea68bbc1..edea68bbc1 100644
--- a/src/java/org/apache/poi/hssf/record/CountryRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java
index 15938de26b..15938de26b 100644
--- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DConRefRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
index e45d0c3cf4..e45d0c3cf4 100644
--- a/src/java/org/apache/poi/hssf/record/DConRefRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DSFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java
index a75a019d68..a75a019d68 100644
--- a/src/java/org/apache/poi/hssf/record/DSFRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DVALRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java
index 8fed47a429..8fed47a429 100644
--- a/src/java/org/apache/poi/hssf/record/DVALRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DVRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DVRecord.java
index a81e67295e..a81e67295e 100644
--- a/src/java/org/apache/poi/hssf/record/DVRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DVRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java b/main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java
index f1f4fd8ef9..f1f4fd8ef9 100644
--- a/src/java/org/apache/poi/hssf/record/DateWindow1904Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java
diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
index 8c18ae1458..8c18ae1458 100644
--- a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
index a68bee910b..a68bee910b 100644
--- a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java
index dd9a28809a..dd9a28809a 100644
--- a/src/java/org/apache/poi/hssf/record/DeltaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java
index b12d008786..b12d008786 100644
--- a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
index 4dbbb70b58..4dbbb70b58 100644
--- a/src/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java
index b368008236..b368008236 100644
--- a/src/java/org/apache/poi/hssf/record/DrawingRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
index 8c9743f4bd..8c9743f4bd 100644
--- a/src/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
diff --git a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
index 94b6ac83d6..94b6ac83d6 100644
--- a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java
index a067b2917d..a067b2917d 100644
--- a/src/java/org/apache/poi/hssf/record/EOFRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
index ab5d3874ef..ab5d3874ef 100644
--- a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java
index 498ce88b06..498ce88b06 100644
--- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/EscherAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
index ac6bc6bf5c..ac6bc6bf5c 100644
--- a/src/java/org/apache/poi/hssf/record/EscherAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java
index b8a9aed2c0..b8a9aed2c0 100644
--- a/src/java/org/apache/poi/hssf/record/ExtSSTRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
index de42bfd8bf..de42bfd8bf 100644
--- a/src/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java
index 7883f988cf..7883f988cf 100644
--- a/src/java/org/apache/poi/hssf/record/ExternSheetRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java
index 41999c819e..41999c819e 100644
--- a/src/java/org/apache/poi/hssf/record/ExternalNameRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java
index deb5daaa6a..deb5daaa6a 100644
--- a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FeatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java
index f5850bfefa..f5850bfefa 100644
--- a/src/java/org/apache/poi/hssf/record/FeatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
index a7fccea0c9..a7fccea0c9 100644
--- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java
index 4249e72a83..4249e72a83 100644
--- a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
index 63b4c603bd..63b4c603bd 100644
--- a/src/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FontRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FontRecord.java
index aedb462a4e..aedb462a4e 100644
--- a/src/java/org/apache/poi/hssf/record/FontRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FontRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java
index 5aee71d1c8..5aee71d1c8 100644
--- a/src/java/org/apache/poi/hssf/record/FooterRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java
index 7b2714bc77..7b2714bc77 100644
--- a/src/java/org/apache/poi/hssf/record/FormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
index 0b702b0128..0b702b0128 100644
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java b/main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
index 9eadacea83..9eadacea83 100644
--- a/src/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
diff --git a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
index 529b9ec234..529b9ec234 100644
--- a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java
index 5cdb539fc1..5cdb539fc1 100644
--- a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
index 7b980b11c6..7b980b11c6 100644
--- a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java
index b5cfd92055..b5cfd92055 100644
--- a/src/java/org/apache/poi/hssf/record/GridsetRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
index 805bca3442..805bca3442 100644
--- a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java
index 165b502677..165b502677 100644
--- a/src/java/org/apache/poi/hssf/record/GutsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java
index 37ee0ff63f..37ee0ff63f 100644
--- a/src/java/org/apache/poi/hssf/record/HCenterRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HSSFRecordTypes.java b/main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
index e8edcd9beb..e8edcd9beb 100644
--- a/src/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java
index 68e242e7bd..68e242e7bd 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderFooterBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java
diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
index 8db7fcb238..8db7fcb238 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java
index b3447121ad..b3447121ad 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HideObjRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java
index cf195a7028..cf195a7028 100644
--- a/src/java/org/apache/poi/hssf/record/HideObjRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
index 67b16b3d0b..67b16b3d0b 100644
--- a/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index 78bda25262..78bda25262 100644
--- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java
index dd7772c845..dd7772c845 100644
--- a/src/java/org/apache/poi/hssf/record/IndexRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java b/main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
index eabd453b4a..eabd453b4a 100644
--- a/src/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java b/main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
index 030299e851..030299e851 100644
--- a/src/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java
index 1dbb863932..1dbb863932 100644
--- a/src/java/org/apache/poi/hssf/record/IterationRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java
index b21286085e..b21286085e 100644
--- a/src/java/org/apache/poi/hssf/record/LabelRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java
index 1872845f8e..1872845f8e 100644
--- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
index cf06408b3f..cf06408b3f 100644
--- a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java
index 1157a32823..1157a32823 100644
--- a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/MMSRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java
index ec2b3808fd..ec2b3808fd 100644
--- a/src/java/org/apache/poi/hssf/record/MMSRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/Margin.java b/main/src/main/java/org/apache/poi/hssf/record/Margin.java
index 933eb75e65..933eb75e65 100644
--- a/src/java/org/apache/poi/hssf/record/Margin.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/Margin.java
diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java
index 3978dc9c60..3978dc9c60 100644
--- a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java
index 0f395cc272..0f395cc272 100644
--- a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/MulRKRecord.java b/main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java
index 86ec9fc64a..86ec9fc64a 100644
--- a/src/java/org/apache/poi/hssf/record/MulRKRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/NameCommentRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java
index c0bf9fd475..c0bf9fd475 100644
--- a/src/java/org/apache/poi/hssf/record/NameCommentRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/NameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NameRecord.java
index 5a527ab04b..5a527ab04b 100644
--- a/src/java/org/apache/poi/hssf/record/NameRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/NameRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/NoteRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java
index c89ac5dece..c89ac5dece 100644
--- a/src/java/org/apache/poi/hssf/record/NoteRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
index 3adff3856d..3adff3856d 100644
--- a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java
index 8441736aa4..8441736aa4 100644
--- a/src/java/org/apache/poi/hssf/record/NumberRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java
index beea8ac7e8..beea8ac7e8 100644
--- a/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
index da8d892954..da8d892954 100644
--- a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/OldCellRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java
index 308cf43475..308cf43475 100644
--- a/src/java/org/apache/poi/hssf/record/OldCellRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
index dd18abebf6..dd18abebf6 100644
--- a/src/java/org/apache/poi/hssf/record/OldFormulaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java
index e393c8e3d8..e393c8e3d8 100644
--- a/src/java/org/apache/poi/hssf/record/OldLabelRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/OldSheetRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java
index 9f2120c393..9f2120c393 100644
--- a/src/java/org/apache/poi/hssf/record/OldSheetRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/OldStringRecord.java b/main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java
index e81a2aa4b8..e81a2aa4b8 100644
--- a/src/java/org/apache/poi/hssf/record/OldStringRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
index 402c04d02c..402c04d02c 100644
--- a/src/java/org/apache/poi/hssf/record/PageBreakRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PaletteRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java
index 7501722277..7501722277 100644
--- a/src/java/org/apache/poi/hssf/record/PaletteRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java
index fa38346961..fa38346961 100644
--- a/src/java/org/apache/poi/hssf/record/PaneRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java
index 2536765c70..2536765c70 100644
--- a/src/java/org/apache/poi/hssf/record/PasswordRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java b/main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java
index af74f6b5b2..af74f6b5b2 100644
--- a/src/java/org/apache/poi/hssf/record/PasswordRev4Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java
diff --git a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java
index 27471b935f..27471b935f 100644
--- a/src/java/org/apache/poi/hssf/record/PrecisionRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
index 7de13c6ec8..7de13c6ec8 100644
--- a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
index 07752d70d4..07752d70d4 100644
--- a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java
index d6404e6245..d6404e6245 100644
--- a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java
index b57cbe72a9..b57cbe72a9 100644
--- a/src/java/org/apache/poi/hssf/record/ProtectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java b/main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
index dff1c5cffd..dff1c5cffd 100644
--- a/src/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RKRecord.java
index d6737ad00d..d6737ad00d 100644
--- a/src/java/org/apache/poi/hssf/record/RKRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RKRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java
index 2a0481c62d..2a0481c62d 100644
--- a/src/java/org/apache/poi/hssf/record/RecalcIdRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/Record.java b/main/src/main/java/org/apache/poi/hssf/record/Record.java
index ede39a04f2..ede39a04f2 100644
--- a/src/java/org/apache/poi/hssf/record/Record.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/Record.java
diff --git a/src/java/org/apache/poi/hssf/record/RecordBase.java b/main/src/main/java/org/apache/poi/hssf/record/RecordBase.java
index 40907ec7e7..40907ec7e7 100644
--- a/src/java/org/apache/poi/hssf/record/RecordBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RecordBase.java
diff --git a/src/java/org/apache/poi/hssf/record/RecordFactory.java b/main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java
index 86014c4d2b..86014c4d2b 100644
--- a/src/java/org/apache/poi/hssf/record/RecordFactory.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java
diff --git a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
index a475269562..a475269562 100644
--- a/src/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
index a8af77c2e1..a8af77c2e1 100644
--- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
diff --git a/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java
index 6929d07cc8..6929d07cc8 100644
--- a/src/java/org/apache/poi/hssf/record/RefModeRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java
index e385f91bec..e385f91bec 100644
--- a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java
index 94fc0645b2..94fc0645b2 100644
--- a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/main/src/main/java/org/apache/poi/hssf/record/RowRecord.java
index e6e0be434e..e6e0be434e 100644
--- a/src/java/org/apache/poi/hssf/record/RowRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/RowRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SCLRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java
index fa338d2d92..fa338d2d92 100644
--- a/src/java/org/apache/poi/hssf/record/SCLRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java b/main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java
index 6b3bce351d..6b3bce351d 100644
--- a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java
diff --git a/src/java/org/apache/poi/hssf/record/SSTRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java
index ad1b3ae903..ad1b3ae903 100644
--- a/src/java/org/apache/poi/hssf/record/SSTRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SSTSerializer.java b/main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java
index c15c7ad1ff..c15c7ad1ff 100644
--- a/src/java/org/apache/poi/hssf/record/SSTSerializer.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java
diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
index 47934d028f..47934d028f 100644
--- a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
index 8e718cc1d3..8e718cc1d3 100644
--- a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java
index 6019a825a0..6019a825a0 100644
--- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
index 0c4f4e6a2b..0c4f4e6a2b 100644
--- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java b/main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
index 3f23037d2a..3f23037d2a 100644
--- a/src/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
diff --git a/src/java/org/apache/poi/hssf/record/StandardRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java
index ac7637672b..ac7637672b 100644
--- a/src/java/org/apache/poi/hssf/record/StandardRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/StringRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StringRecord.java
index efd86f1f79..efd86f1f79 100644
--- a/src/java/org/apache/poi/hssf/record/StringRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/StringRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/StyleRecord.java b/main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java
index 8f14499d80..8f14499d80 100644
--- a/src/java/org/apache/poi/hssf/record/StyleRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SubRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SubRecord.java
index 0429267162..0429267162 100644
--- a/src/java/org/apache/poi/hssf/record/SubRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SubRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/SupBookRecord.java b/main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
index 2d610ac981..2d610ac981 100644
--- a/src/java/org/apache/poi/hssf/record/SupBookRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TabIdRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java
index c76a396bd7..c76a396bd7 100644
--- a/src/java/org/apache/poi/hssf/record/TabIdRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TableRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TableRecord.java
index 52bda012b8..52bda012b8 100644
--- a/src/java/org/apache/poi/hssf/record/TableRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/TableRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TableStylesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java
index b1ffccc513..b1ffccc513 100644
--- a/src/java/org/apache/poi/hssf/record/TableStylesRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java
index 8beeb3a621..8beeb3a621 100644
--- a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java
index 05aaab3f8e..05aaab3f8e 100644
--- a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/UncalcedRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java
index f53118d8b1..f53118d8b1 100644
--- a/src/java/org/apache/poi/hssf/record/UncalcedRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
index f67002f8d9..f67002f8d9 100644
--- a/src/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java
index 139c2faa18..139c2faa18 100644
--- a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java
index b283673eec..b283673eec 100644
--- a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java
diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java
index 4acfa89a2e..4acfa89a2e 100644
--- a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java
diff --git a/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java
index 4090730e9b..4090730e9b 100644
--- a/src/java/org/apache/poi/hssf/record/VCenterRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
index bd28b190c2..bd28b190c2 100644
--- a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java
index 0bdee8b994..0bdee8b994 100644
--- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java
index 8adcd475bb..8adcd475bb 100644
--- a/src/java/org/apache/poi/hssf/record/WindowOneRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java
index 368f39a66a..368f39a66a 100644
--- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java
index 7548361afc..7548361afc 100644
--- a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java
index f1bf1373c3..f1bf1373c3 100644
--- a/src/java/org/apache/poi/hssf/record/WriteAccessRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java
index 665d656108..665d656108 100644
--- a/src/java/org/apache/poi/hssf/record/WriteProtectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
index cd513e8683..cd513e8683 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
index 795a66389e..795a66389e 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
index ab14e35e34..ab14e35e34 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
index 2afbb3813d..2afbb3813d 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
index 40fe4dfc17..40fe4dfc17 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
index e6ad8bb29d..e6ad8bb29d 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
index 62c3df3a05..62c3df3a05 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
index c698cb0d27..c698cb0d27 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
index c8d931f349..c8d931f349 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
index c8103501ed..c8103501ed 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
index 738d1d9b13..738d1d9b13 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
index 03de03ebbd..03de03ebbd 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
index fff9cc9b37..fff9cc9b37 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
index 9a1a6418db..9a1a6418db 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/package-info.java b/main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java
index 79c1fbcb3a..79c1fbcb3a 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
index e4ea808c4b..e4ea808c4b 100644
--- a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
index ab463c9fa8..ab463c9fa8 100644
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
index 51ea9ba716..51ea9ba716 100644
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
index 5063cfe3bf..5063cfe3bf 100644
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
index bef35e555e..bef35e555e 100644
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java
index fe40aec82f..fe40aec82f 100644
--- a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
index ac2a42fc15..ac2a42fc15 100644
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
index 3b1c8f87c8..3b1c8f87c8 100644
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
index 4bad219297..4bad219297 100644
--- a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
diff --git a/src/java/org/apache/poi/hssf/record/cf/Threshold.java b/main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java
index 6c161d7927..6c161d7927 100644
--- a/src/java/org/apache/poi/hssf/record/cf/Threshold.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
index f3c309e5a5..f3c309e5a5 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java
index 93462b4878..93462b4878 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
index 26e669d46f..26e669d46f 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
index 3236ff04df..3236ff04df 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
index f9680ac14b..f9680ac14b 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java
index 2da5fd4fe1..2da5fd4fe1 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
index bd22059232..bd22059232 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java
index fd7a1c206a..fd7a1c206a 100644
--- a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java
index 09932be3c9..09932be3c9 100644
--- a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
index 9cb603d253..9cb603d253 100644
--- a/src/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
index ea2a80bd3b..ea2a80bd3b 100644
--- a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
index c222c8a47e..c222c8a47e 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
index 86c8ea10db..86c8ea10db 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
index 66e10fbab0..66e10fbab0 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
index 308c6f38ee..308c6f38ee 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java
index 0512e6814a..0512e6814a 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
index 6e9601e09a..6e9601e09a 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
index 27a600cfad..27a600cfad 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
index 281cfb5138..281cfb5138 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java
index 26e34a5195..26e34a5195 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
index ba319f23f2..ba319f23f2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
index 6374d8fb8c..6374d8fb8c 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
index aafee0b3a2..aafee0b3a2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java
index 9bef5a0ab2..9bef5a0ab2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
index 0a4a3c3f7c..0a4a3c3f7c 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
index d46df3338d..d46df3338d 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java
index 85cd206c65..85cd206c65 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java
index ebbe2e1e76..ebbe2e1e76 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
index 94d307c752..94d307c752 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
index 0b4810bc99..0b4810bc99 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
index 8a4077b7d6..8a4077b7d6 100644
--- a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
index f6305eedd7..f6305eedd7 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
index e35d2301af..e35d2301af 100644
--- a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
index 8167858e24..8167858e24 100644
--- a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
index ca456168a4..ca456168a4 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
index 7564965d26..7564965d26 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
index 286b42e353..286b42e353 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
index ac1fb5aba2..ac1fb5aba2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
index 4ed7ee3b60..4ed7ee3b60 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
index 4eecfc484a..4eecfc484a 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
index 00158480e2..00158480e2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java
index 7c3c8666aa..7c3c8666aa 100644
--- a/src/java/org/apache/poi/hssf/record/chart/TextRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java
index 434f9aa74e..434f9aa74e 100644
--- a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
index 661e521c2f..661e521c2f 100644
--- a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
index e18ebcc1b8..e18ebcc1b8 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/common/ExtRst.java b/main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java
index bb409edcad..bb409edcad 100644
--- a/src/java/org/apache/poi/hssf/record/common/ExtRst.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java
diff --git a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java
index e81cab49da..e81cab49da 100644
--- a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
index f7330fd5ec..f7330fd5ec 100644
--- a/src/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FeatProtection.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java
index b8d4aa80c9..b8d4aa80c9 100644
--- a/src/java/org/apache/poi/hssf/record/common/FeatProtection.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java b/main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
index 976f9a6d1c..976f9a6d1c 100644
--- a/src/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FormatRun.java b/main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java
index e0438e353f..e0438e353f 100644
--- a/src/java/org/apache/poi/hssf/record/common/FormatRun.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java b/main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java
index fbf46f9d01..fbf46f9d01 100644
--- a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java
diff --git a/src/java/org/apache/poi/hssf/record/common/FutureRecord.java b/main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java
index 65a26cca73..65a26cca73 100644
--- a/src/java/org/apache/poi/hssf/record/common/FutureRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/common/PhRun.java b/main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java
index 404efb0bd0..404efb0bd0 100644
--- a/src/java/org/apache/poi/hssf/record/common/PhRun.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java
diff --git a/src/java/org/apache/poi/hssf/record/common/SharedFeature.java b/main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java
index 5880bbc8ef..5880bbc8ef 100644
--- a/src/java/org/apache/poi/hssf/record/common/SharedFeature.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java
diff --git a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
index d9b56d7e7d..d9b56d7e7d 100644
--- a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
index dceb7b86b1..dceb7b86b1 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
index 0026aabaa8..0026aabaa8 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
diff --git a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
index a39f1393e0..a39f1393e0 100644
--- a/src/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
diff --git a/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java b/main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
index 947cbcd595..947cbcd595 100644
--- a/src/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
diff --git a/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
index b9a7638789..b9a7638789 100644
--- a/src/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
diff --git a/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
index 23cd17a823..23cd17a823 100644
--- a/src/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
diff --git a/src/java/org/apache/poi/hssf/record/package-info.java b/main/src/main/java/org/apache/poi/hssf/record/package-info.java
index 9d47affa70..9d47affa70 100644
--- a/src/java/org/apache/poi/hssf/record/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/package-info.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
index 9d77e4b361..9d77e4b361 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
index ade9c24d88..ade9c24d88 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
index c1b0f91be4..c1b0f91be4 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
index 11beef32b9..11beef32b9 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
index 190b5e4d39..190b5e4d39 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
index 7bbfbb68fb..7bbfbb68fb 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
diff --git a/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
index 20aa600aea..20aa600aea 100644
--- a/src/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
+++ b/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java b/main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java
index 5317969278..5317969278 100644
--- a/src/java/org/apache/poi/hssf/usermodel/DVConstraint.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
index 4e3c4bd1ca..4e3c4bd1ca 100644
--- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
index a5e3516ab0..a5e3516ab0 100644
--- a/src/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/FontDetails.java b/main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java
index d9fc1d54c2..d9fc1d54c2 100644
--- a/src/java/org/apache/poi/hssf/usermodel/FontDetails.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
index 56c918af47..56c918af47 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
index 533dffee37..533dffee37 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
index f0de680a6a..f0de680a6a 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
index a48313176a..a48313176a 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index 3f78756a7d..3f78756a7d 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFChart.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
index d78ac00d4d..d78ac00d4d 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
index a7a88c6b6b..a7a88c6b6b 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
index a9ffbea496..a9ffbea496 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
index 36c5a53e0c..36c5a53e0c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
index 262eae5086..262eae5086 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java
index c62bd4daf1..c62bd4daf1 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFComment.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
index 26bdd6bd95..26bdd6bd95 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
index 29506743f6..29506743f6 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
index 4ab124c05c..4ab124c05c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
index 754930f13b..754930f13b 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
index f796dd80dd..f796dd80dd 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
index 09284dcb90..09284dcb90 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
index ef3eb93154..ef3eb93154 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
index 40c0ada463..40c0ada463 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
index 15161cb882..15161cb882 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
index f0ff039fd1..f0ff039fd1 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
index 4b90599e43..4b90599e43 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
index dd6c1f09df..dd6c1f09df 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
index b0fa3e28f7..b0fa3e28f7 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
index b178263185..b178263185 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java
index 2cdb4e8b7e..2cdb4e8b7e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFont.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
index 735d921cc3..735d921cc3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
index e23c21bea0..e23c21bea0 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
index f8ab24a0e8..f8ab24a0e8 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
index 41530874f1..41530874f1 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
index 1b51235bc8..1b51235bc8 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
index cabfad2f80..cabfad2f80 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
index c805c573e9..c805c573e9 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
index 3909f41400..3909f41400 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
index 40799029be..40799029be 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
index b74bf1b570..b74bf1b570 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
index e5b6d668cc..e5b6d668cc 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
index 1f521c509e..1f521c509e 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
index e66658905f..e66658905f 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 9dd6079624..9dd6079624 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
index 430fe62798..430fe62798 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
index 6399b883af..6399b883af 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
index 60b1a23417..60b1a23417 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
index 34b95d7fa0..34b95d7fa0 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
index 0ecc946636..0ecc946636 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java
index 964356f5a6..964356f5a6 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShape.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
index 28f7894dd0..28f7894dd0 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
index c7dce30535..c7dce30535 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
index b8001fc651..b8001fc651 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
index d72b4003d1..d72b4003d1 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 975419077c..975419077c 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
index 436a7f5d1f..436a7f5d1f 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
index 02d5e7fdac..02d5e7fdac 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
index 5821a42f57..5821a42f57 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index bd86c2857f..bd86c2857f 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
index b43a45de6a..b43a45de6a 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
index 38464490d6..38464490d6 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java b/main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
index 453f3db384..453f3db384 100644
--- a/src/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
index 3f86caddd6..3f86caddd6 100644
--- a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
index 4a743556a4..4a743556a4 100644
--- a/src/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
diff --git a/src/java/org/apache/poi/hssf/usermodel/package-info.java b/main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java
index 7fe4e03ee3..7fe4e03ee3 100644
--- a/src/java/org/apache/poi/hssf/usermodel/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java
diff --git a/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java b/main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
index c70e525667..c70e525667 100644
--- a/src/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
+++ b/main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
diff --git a/src/java/org/apache/poi/hssf/util/HSSFColor.java b/main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java
index a7d53da928..a7d53da928 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFColor.java
+++ b/main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java
diff --git a/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java b/main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
index 5b084916a2..5b084916a2 100644
--- a/src/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
+++ b/main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
diff --git a/src/java/org/apache/poi/hssf/util/RKUtil.java b/main/src/main/java/org/apache/poi/hssf/util/RKUtil.java
index 42cdd379b5..42cdd379b5 100644
--- a/src/java/org/apache/poi/hssf/util/RKUtil.java
+++ b/main/src/main/java/org/apache/poi/hssf/util/RKUtil.java
diff --git a/src/java/org/apache/poi/hssf/util/package-info.java b/main/src/main/java/org/apache/poi/hssf/util/package-info.java
index 4ac9c8f6f6..4ac9c8f6f6 100644
--- a/src/java/org/apache/poi/hssf/util/package-info.java
+++ b/main/src/main/java/org/apache/poi/hssf/util/package-info.java
diff --git a/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java b/main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
index 1e8b1b113a..1e8b1b113a 100644
--- a/src/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
+++ b/main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
diff --git a/src/java/org/apache/poi/poifs/common/POIFSConstants.java b/main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java
index f3804a90be..f3804a90be 100644
--- a/src/java/org/apache/poi/poifs/common/POIFSConstants.java
+++ b/main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java
diff --git a/src/java/org/apache/poi/poifs/common/package-info.java b/main/src/main/java/org/apache/poi/poifs/common/package-info.java
index 2df44254bd..2df44254bd 100644
--- a/src/java/org/apache/poi/poifs/common/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/common/package-info.java
diff --git a/src/java/org/apache/poi/poifs/crypt/ChainingMode.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java
index f32910e1ab..f32910e1ab 100644
--- a/src/java/org/apache/poi/poifs/crypt/ChainingMode.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java
diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
index 827ee4c0a7..827ee4c0a7 100644
--- a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
index 5270fc0461..5270fc0461 100644
--- a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
diff --git a/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java b/main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
index 5ec778617c..5ec778617c 100644
--- a/src/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
diff --git a/src/java/org/apache/poi/poifs/crypt/CipherProvider.java b/main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java
index ac2dbafd0a..ac2dbafd0a 100644
--- a/src/java/org/apache/poi/poifs/crypt/CipherProvider.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java
diff --git a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
index 369cbd67e4..369cbd67e4 100644
--- a/src/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
diff --git a/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java b/main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
index 09a56e2e81..09a56e2e81 100644
--- a/src/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
diff --git a/src/java/org/apache/poi/poifs/crypt/Decryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java
index 34a12b5e0a..34a12b5e0a 100644
--- a/src/java/org/apache/poi/poifs/crypt/Decryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
index f10dda09bd..f10dda09bd 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
index 30fc9539e3..30fc9539e3 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
index c32b069116..c32b069116 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java
index 393247df8d..393247df8d 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionMode.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java
diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
index 2d3f0fe64a..2d3f0fe64a 100644
--- a/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/Encryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java
index 9c2041d72a..9c2041d72a 100644
--- a/src/java/org/apache/poi/poifs/crypt/Encryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java b/main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
index b4618dc0b5..b4618dc0b5 100644
--- a/src/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
index 898670eaba..898670eaba 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
index 78c289f5ea..78c289f5ea 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
index 0674305b22..0674305b22 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
index 6699b543c4..6699b543c4 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
index 9200fb3830..9200fb3830 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
index 938b04f466..938b04f466 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
index 5d067b0232..5d067b0232 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
index 07004d05a5..07004d05a5 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/KeyData.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
index fba57eb2c4..fba57eb2c4 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/KeyData.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
index c7e591d160..c7e591d160 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
index 1e3f8640ff..1e3f8640ff 100644
--- a/src/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
index ff14f19ab3..ff14f19ab3 100644
--- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
index f9051b652c..f9051b652c 100644
--- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
index d8b8573597..d8b8573597 100644
--- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
index f771b77550..f771b77550 100644
--- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
index c048271421..c048271421 100644
--- a/src/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
index df2a51bc38..df2a51bc38 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
index c2391b1680..c2391b1680 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
index 3a9cae9b04..3a9cae9b04 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
index 9c0af9b177..9c0af9b177 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
index c1484d691b..c1484d691b 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
index f2c00410b3..f2c00410b3 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
index 652e7f51d7..652e7f51d7 100644
--- a/src/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/package-info.java b/main/src/main/java/org/apache/poi/poifs/crypt/package-info.java
index df27963002..df27963002 100644
--- a/src/java/org/apache/poi/poifs/crypt/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/package-info.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
index 3b45190497..3b45190497 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
index 9fedce6122..9fedce6122 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
index 139bb2ac70..139bb2ac70 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
index b46055b967..b46055b967 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
index d30fe998b2..d30fe998b2 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
index 097a7bd6d7..097a7bd6d7 100644
--- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
index d2cebca389..d2cebca389 100644
--- a/src/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
index 4af028656a..4af028656a 100644
--- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
index 9fcaf8b35b..9fcaf8b35b 100644
--- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
index 5f583a7f2c..5f583a7f2c 100644
--- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
diff --git a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
index 0c1cbf4932..0c1cbf4932 100644
--- a/src/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSDump.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java
index fed8c008bf..fed8c008bf 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSDump.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSLister.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java
index f9696bccfb..f9696bccfb 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSLister.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
index 8db1bf3129..8db1bf3129 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewable.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java
index 8349e66973..8349e66973 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSViewable.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java
diff --git a/src/java/org/apache/poi/poifs/dev/POIFSViewer.java b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java
index 0be693444f..0be693444f 100644
--- a/src/java/org/apache/poi/poifs/dev/POIFSViewer.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java
diff --git a/src/java/org/apache/poi/poifs/dev/package-info.java b/main/src/main/java/org/apache/poi/poifs/dev/package-info.java
index 4d04219f88..4d04219f88 100644
--- a/src/java/org/apache/poi/poifs/dev/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/dev/package-info.java
diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
index 60487e1e8e..60487e1e8e 100644
--- a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
+++ b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
index fd228a5b6c..fd228a5b6c 100644
--- a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
+++ b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
index 56a3b78479..56a3b78479 100644
--- a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
+++ b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
index 9ffac63120..9ffac63120 100644
--- a/src/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
+++ b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
diff --git a/src/java/org/apache/poi/poifs/eventfilesystem/package-info.java b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java
index 34760da4d4..34760da4d4 100644
--- a/src/java/org/apache/poi/poifs/eventfilesystem/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/BATManaged.java b/main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java
index fcd3bde649..fcd3bde649 100644
--- a/src/java/org/apache/poi/poifs/filesystem/BATManaged.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/BlockStore.java b/main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
index bdd016f860..bdd016f860 100644
--- a/src/java/org/apache/poi/poifs/filesystem/BlockStore.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
index 7148fda3cf..7148fda3cf 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
index e91da26fb5..e91da26fb5 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
index 0c1b2c8177..0c1b2c8177 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
index 29f4b8afbf..29f4b8afbf 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
index 088b549283..088b549283 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
index bf07261ef9..bf07261ef9 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java
index 06c854dfc2..06c854dfc2 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentNode.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
index a1052d865c..a1052d865c 100644
--- a/src/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/Entry.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java
index 2a8ea16aac..2a8ea16aac 100644
--- a/src/java/org/apache/poi/poifs/filesystem/Entry.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java
index a48d8e4f9a..a48d8e4f9a 100644
--- a/src/java/org/apache/poi/poifs/filesystem/EntryNode.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java
index bd21697fcf..bd21697fcf 100644
--- a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/FileMagic.java b/main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java
index 81cd6187e2..81cd6187e2 100644
--- a/src/java/org/apache/poi/poifs/filesystem/FileMagic.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java b/main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
index 717247c5b6..717247c5b6 100644
--- a/src/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
index 18387cfb77..18387cfb77 100644
--- a/src/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
index ac2404b72a..ac2404b72a 100644
--- a/src/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
index c2d4a73ae4..c2d4a73ae4 100644
--- a/src/java/org/apache/poi/poifs/filesystem/Ole10Native.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
index 47fd9e95a4..47fd9e95a4 100644
--- a/src/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
index 05881561b1..05881561b1 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
index 1db851e8b6..1db851e8b6 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
index 2fb09dc04d..2fb09dc04d 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
index db49e5b814..db49e5b814 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java
index f34d4da6ab..f34d4da6ab 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSStream.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
index a3954c3720..a3954c3720 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
index 9f9e396a11..9f9e396a11 100644
--- a/src/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java b/main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
index be162b6079..be162b6079 100644
--- a/src/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
diff --git a/src/java/org/apache/poi/poifs/filesystem/package-info.java b/main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java
index 84c2d9f35d..84c2d9f35d 100644
--- a/src/java/org/apache/poi/poifs/filesystem/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java
diff --git a/src/java/org/apache/poi/poifs/macros/Module.java b/main/src/main/java/org/apache/poi/poifs/macros/Module.java
index 29924d9d89..29924d9d89 100644
--- a/src/java/org/apache/poi/poifs/macros/Module.java
+++ b/main/src/main/java/org/apache/poi/poifs/macros/Module.java
diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
index 9874270a9d..9874270a9d 100644
--- a/src/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
+++ b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
diff --git a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
index 2f28c6397e..2f28c6397e 100644
--- a/src/java/org/apache/poi/poifs/macros/VBAMacroReader.java
+++ b/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
diff --git a/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
index 15c4f6ff07..15c4f6ff07 100644
--- a/src/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
+++ b/main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
diff --git a/src/java/org/apache/poi/poifs/nio/CleanerUtil.java b/main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java
index bc05b25532..bc05b25532 100644
--- a/src/java/org/apache/poi/poifs/nio/CleanerUtil.java
+++ b/main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java
diff --git a/src/java/org/apache/poi/poifs/nio/DataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/DataSource.java
index f43667626f..f43667626f 100644
--- a/src/java/org/apache/poi/poifs/nio/DataSource.java
+++ b/main/src/main/java/org/apache/poi/poifs/nio/DataSource.java
diff --git a/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java b/main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
index e3001f238f..e3001f238f 100644
--- a/src/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
+++ b/main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
diff --git a/src/java/org/apache/poi/poifs/package-info.java b/main/src/main/java/org/apache/poi/poifs/package-info.java
index 78420021c9..78420021c9 100644
--- a/src/java/org/apache/poi/poifs/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/package-info.java
diff --git a/src/java/org/apache/poi/poifs/property/Child.java b/main/src/main/java/org/apache/poi/poifs/property/Child.java
index 6047452149..6047452149 100644
--- a/src/java/org/apache/poi/poifs/property/Child.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/Child.java
diff --git a/src/java/org/apache/poi/poifs/property/DirectoryProperty.java b/main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
index 07846736c2..07846736c2 100644
--- a/src/java/org/apache/poi/poifs/property/DirectoryProperty.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
diff --git a/src/java/org/apache/poi/poifs/property/DocumentProperty.java b/main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java
index 0a7c587e2a..0a7c587e2a 100644
--- a/src/java/org/apache/poi/poifs/property/DocumentProperty.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java
diff --git a/src/java/org/apache/poi/poifs/property/Parent.java b/main/src/main/java/org/apache/poi/poifs/property/Parent.java
index 24e2bb266d..24e2bb266d 100644
--- a/src/java/org/apache/poi/poifs/property/Parent.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/Parent.java
diff --git a/src/java/org/apache/poi/poifs/property/Property.java b/main/src/main/java/org/apache/poi/poifs/property/Property.java
index 6ffff00424..6ffff00424 100644
--- a/src/java/org/apache/poi/poifs/property/Property.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/Property.java
diff --git a/src/java/org/apache/poi/poifs/property/PropertyConstants.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java
index cf89f40858..cf89f40858 100644
--- a/src/java/org/apache/poi/poifs/property/PropertyConstants.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java
diff --git a/src/java/org/apache/poi/poifs/property/PropertyFactory.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java
index ba459050bf..ba459050bf 100644
--- a/src/java/org/apache/poi/poifs/property/PropertyFactory.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java
diff --git a/src/java/org/apache/poi/poifs/property/PropertyTable.java b/main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
index 596bea5070..596bea5070 100644
--- a/src/java/org/apache/poi/poifs/property/PropertyTable.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
diff --git a/src/java/org/apache/poi/poifs/property/RootProperty.java b/main/src/main/java/org/apache/poi/poifs/property/RootProperty.java
index c74a02a29d..c74a02a29d 100644
--- a/src/java/org/apache/poi/poifs/property/RootProperty.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/RootProperty.java
diff --git a/src/java/org/apache/poi/poifs/property/package-info.java b/main/src/main/java/org/apache/poi/poifs/property/package-info.java
index 9ffa4aebc7..9ffa4aebc7 100644
--- a/src/java/org/apache/poi/poifs/property/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/property/package-info.java
diff --git a/src/java/org/apache/poi/poifs/storage/BATBlock.java b/main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
index 9ef00ad1f5..9ef00ad1f5 100644
--- a/src/java/org/apache/poi/poifs/storage/BATBlock.java
+++ b/main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
diff --git a/src/java/org/apache/poi/poifs/storage/BlockWritable.java b/main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java
index 3bf833ec10..3bf833ec10 100644
--- a/src/java/org/apache/poi/poifs/storage/BlockWritable.java
+++ b/main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java
diff --git a/src/java/org/apache/poi/poifs/storage/HeaderBlock.java b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
index 24b1a99008..24b1a99008 100644
--- a/src/java/org/apache/poi/poifs/storage/HeaderBlock.java
+++ b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
diff --git a/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
index 5470bde5b8..5470bde5b8 100644
--- a/src/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
+++ b/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
diff --git a/src/java/org/apache/poi/poifs/storage/package-info.java b/main/src/main/java/org/apache/poi/poifs/storage/package-info.java
index 9fadf9df91..9fadf9df91 100644
--- a/src/java/org/apache/poi/poifs/storage/package-info.java
+++ b/main/src/main/java/org/apache/poi/poifs/storage/package-info.java
diff --git a/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
index 96e63a6448..96e63a6448 100644
--- a/src/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawAutoShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java
index 5503542a10..5503542a10 100644
--- a/src/java/org/apache/poi/sl/draw/DrawAutoShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawBackground.java b/main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java
index c61f6dbb79..c61f6dbb79 100644
--- a/src/java/org/apache/poi/sl/draw/DrawBackground.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java
index bb973f5f8a..bb973f5f8a 100644
--- a/src/java/org/apache/poi/sl/draw/DrawConnectorShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawFactory.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java
index 6b63274455..6b63274455 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFactory.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawFontInfo.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java
index da1979cb9e..da1979cb9e 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFontInfo.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawFontManager.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java
index 72216b36bd..72216b36bd 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFontManager.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
index a5acccd023..a5acccd023 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java
index be18f037ab..be18f037ab 100644
--- a/src/java/org/apache/poi/sl/draw/DrawFreeformShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java b/main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
index 0628429f83..0628429f83 100644
--- a/src/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawGroupShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java
index 3472d85437..3472d85437 100644
--- a/src/java/org/apache/poi/sl/draw/DrawGroupShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java b/main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java
index 2dbbfef69b..2dbbfef69b 100644
--- a/src/java/org/apache/poi/sl/draw/DrawMasterSheet.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java b/main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java
index 246e8d8a1b..246e8d8a1b 100644
--- a/src/java/org/apache/poi/sl/draw/DrawNotImplemented.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawNothing.java b/main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java
index f875da7fc5..f875da7fc5 100644
--- a/src/java/org/apache/poi/sl/draw/DrawNothing.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawPaint.java b/main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java
index e78dd2ee14..e78dd2ee14 100644
--- a/src/java/org/apache/poi/sl/draw/DrawPaint.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
index 764f1f576a..764f1f576a 100644
--- a/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawShape.java
index 05407e6a78..05407e6a78 100644
--- a/src/java/org/apache/poi/sl/draw/DrawShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawSheet.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java
index 4134b5ace0..4134b5ace0 100644
--- a/src/java/org/apache/poi/sl/draw/DrawSheet.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java
index 88b7eea935..88b7eea935 100644
--- a/src/java/org/apache/poi/sl/draw/DrawSimpleShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawSlide.java b/main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java
index 295c584387..295c584387 100644
--- a/src/java/org/apache/poi/sl/draw/DrawSlide.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTableShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java
index 1974f0d9a7..1974f0d9a7 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTableShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTextBox.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java
index 1b2b2f444c..1b2b2f444c 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextBox.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTextFragment.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java
index 7bc23cfa7c..7bc23cfa7c 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextFragment.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java
index b49f7276b8..b49f7276b8 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTextShape.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java
index d8d23b5676..d8d23b5676 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTextShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java
diff --git a/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java b/main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java
index 2d3db49069..2d3db49069 100644
--- a/src/java/org/apache/poi/sl/draw/DrawTexturePaint.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java
diff --git a/src/java/org/apache/poi/sl/draw/Drawable.java b/main/src/main/java/org/apache/poi/sl/draw/Drawable.java
index cb5f8592f9..cb5f8592f9 100644
--- a/src/java/org/apache/poi/sl/draw/Drawable.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/Drawable.java
diff --git a/src/java/org/apache/poi/sl/draw/EmbeddedExtractor.java b/main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
index 5fcdba52d7..5fcdba52d7 100644
--- a/src/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
diff --git a/src/java/org/apache/poi/sl/draw/ImageRenderer.java b/main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java
index 6f255c72d0..6f255c72d0 100644
--- a/src/java/org/apache/poi/sl/draw/ImageRenderer.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java
diff --git a/src/java/org/apache/poi/sl/draw/PathGradientPaint.java b/main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java
index 40c802ccac..40c802ccac 100644
--- a/src/java/org/apache/poi/sl/draw/PathGradientPaint.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java
diff --git a/src/java/org/apache/poi/sl/draw/SLGraphics.java b/main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java
index 9d0398e585..9d0398e585 100644
--- a/src/java/org/apache/poi/sl/draw/SLGraphics.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
index a101c167a1..a101c167a1 100644
--- a/src/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
index 27c5e09a7f..27c5e09a7f 100644
--- a/src/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java
index 68570b1599..68570b1599 100644
--- a/src/java/org/apache/poi/sl/draw/geom/AdjustValue.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
index 4c6c14d09b..4c6c14d09b 100644
--- a/src/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java b/main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
index 63501a985c..63501a985c 100644
--- a/src/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
index ab7a37a444..ab7a37a444 100644
--- a/src/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java b/main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
index 9f19ebccc6..9f19ebccc6 100644
--- a/src/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/Context.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Context.java
index 3ac4495929..3ac4495929 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Context.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/Context.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
index 2e121c7893..2e121c7893 100644
--- a/src/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java b/main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
index ff7a1c2f5f..ff7a1c2f5f 100644
--- a/src/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/Formula.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java
index 24a49b80a6..24a49b80a6 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Formula.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/Guide.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java
index 77da392058..77da392058 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Guide.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java b/main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
index 3145507dca..3145507dca 100644
--- a/src/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java
index b1965fab87..b1965fab87 100644
--- a/src/java/org/apache/poi/sl/draw/geom/LineToCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
index 6ebaa206b3..6ebaa206b3 100644
--- a/src/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/Outline.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java
index 11e643dad2..11e643dad2 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Outline.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/Path.java b/main/src/main/java/org/apache/poi/sl/draw/geom/Path.java
index 2d86f4747d..2d86f4747d 100644
--- a/src/java/org/apache/poi/sl/draw/geom/Path.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/Path.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/PathCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java
index 76a53e7de2..76a53e7de2 100644
--- a/src/java/org/apache/poi/sl/draw/geom/PathCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
index 97ca9afa97..97ca9afa97 100644
--- a/src/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
index acde02c945..acde02c945 100644
--- a/src/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/PresetParser.java b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java
index 998b0ee776..998b0ee776 100644
--- a/src/java/org/apache/poi/sl/draw/geom/PresetParser.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java b/main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
index 4278a00274..4278a00274 100644
--- a/src/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
diff --git a/src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java b/main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
index 46975da2c8..46975da2c8 100644
--- a/src/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
+++ b/main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
diff --git a/src/java/org/apache/poi/sl/extractor/SlideShowExtractor.java b/main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
index fabab5a7a1..fabab5a7a1 100644
--- a/src/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
+++ b/main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
index b7d0a3c4ec..b7d0a3c4ec 100644
--- a/src/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
+++ b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java
index 6dd5faf440..6dd5faf440 100644
--- a/src/java/org/apache/poi/sl/image/ImageHeaderEMF.java
+++ b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java
diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java
index bf9cacefaf..bf9cacefaf 100644
--- a/src/java/org/apache/poi/sl/image/ImageHeaderPICT.java
+++ b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java
diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderPNG.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
index 400bedd74e..400bedd74e 100644
--- a/src/java/org/apache/poi/sl/image/ImageHeaderPNG.java
+++ b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
diff --git a/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java
index cf2f75867f..cf2f75867f 100644
--- a/src/java/org/apache/poi/sl/image/ImageHeaderWMF.java
+++ b/main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java
diff --git a/src/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
index 32e146edf0..32e146edf0 100644
--- a/src/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
diff --git a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
index 939add734f..939add734f 100644
--- a/src/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
diff --git a/src/java/org/apache/poi/sl/usermodel/AutoShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
index bea0502135..bea0502135 100644
--- a/src/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Background.java b/main/src/main/java/org/apache/poi/sl/usermodel/Background.java
index 879879a209..879879a209 100644
--- a/src/java/org/apache/poi/sl/usermodel/Background.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Background.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ColorStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java
index da24d16583..da24d16583 100644
--- a/src/java/org/apache/poi/sl/usermodel/ColorStyle.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Comment.java b/main/src/main/java/org/apache/poi/sl/usermodel/Comment.java
index 43e46efec8..43e46efec8 100644
--- a/src/java/org/apache/poi/sl/usermodel/Comment.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Comment.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java
index 2b580daeb8..2b580daeb8 100644
--- a/src/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/FillStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java
index 2bcfd5ce79..2bcfd5ce79 100644
--- a/src/java/org/apache/poi/sl/usermodel/FillStyle.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java
diff --git a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java
index 42ae10ae9a..42ae10ae9a 100644
--- a/src/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
index def24d9597..def24d9597 100644
--- a/src/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
diff --git a/src/java/org/apache/poi/sl/usermodel/GroupShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java
index 31f5be5345..31f5be5345 100644
--- a/src/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
index 381c928995..381c928995 100644
--- a/src/java/org/apache/poi/sl/usermodel/Hyperlink.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Insets2D.java b/main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java
index 7fec6354f5..7fec6354f5 100644
--- a/src/java/org/apache/poi/sl/usermodel/Insets2D.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Line.java b/main/src/main/java/org/apache/poi/sl/usermodel/Line.java
index d2c2134e52..d2c2134e52 100644
--- a/src/java/org/apache/poi/sl/usermodel/Line.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Line.java
diff --git a/src/java/org/apache/poi/sl/usermodel/LineDecoration.java b/main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java
index 7d78e8040a..7d78e8040a 100644
--- a/src/java/org/apache/poi/sl/usermodel/LineDecoration.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java
diff --git a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java b/main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
index 81da0bb19a..81da0bb19a 100644
--- a/src/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Notes.java b/main/src/main/java/org/apache/poi/sl/usermodel/Notes.java
index 377ad24c40..377ad24c40 100644
--- a/src/java/org/apache/poi/sl/usermodel/Notes.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Notes.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectData.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java
index 11a94281ed..11a94281ed 100644
--- a/src/java/org/apache/poi/sl/usermodel/ObjectData.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectMetaData.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
index 1851b0c8b0..1851b0c8b0 100644
--- a/src/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ObjectShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
index c7d421950e..c7d421950e 100644
--- a/src/java/org/apache/poi/sl/usermodel/ObjectShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PaintStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java
index 21f0824a2f..21f0824a2f 100644
--- a/src/java/org/apache/poi/sl/usermodel/PaintStyle.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PictureData.java b/main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
index df2ca79b01..df2ca79b01 100644
--- a/src/java/org/apache/poi/sl/usermodel/PictureData.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PictureShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java
index 03b2f642a4..03b2f642a4 100644
--- a/src/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java
index 80d9f0fa52..80d9f0fa52 100644
--- a/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Placeholder.java b/main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java
index 1d7e4c421c..1d7e4c421c 100644
--- a/src/java/org/apache/poi/sl/usermodel/Placeholder.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
index 7c4418f164..7c4418f164 100644
--- a/src/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
diff --git a/src/java/org/apache/poi/sl/usermodel/PresetColor.java b/main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java
index 2538d1b828..2538d1b828 100644
--- a/src/java/org/apache/poi/sl/usermodel/PresetColor.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java
diff --git a/src/java/org/apache/poi/sl/usermodel/RectAlign.java b/main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java
index 8fd9efc0db..8fd9efc0db 100644
--- a/src/java/org/apache/poi/sl/usermodel/RectAlign.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Shadow.java b/main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java
index de462f9132..de462f9132 100644
--- a/src/java/org/apache/poi/sl/usermodel/Shadow.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/main/src/main/java/org/apache/poi/sl/usermodel/Shape.java
index 4929f48bb8..4929f48bb8 100644
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Shape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
index 7706828c52..7706828c52 100644
--- a/src/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
diff --git a/src/java/org/apache/poi/sl/usermodel/ShapeType.java b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java
index 31ab5011ae..31ab5011ae 100644
--- a/src/java/org/apache/poi/sl/usermodel/ShapeType.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Sheet.java b/main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
index ae7cd179bc..ae7cd179bc 100644
--- a/src/java/org/apache/poi/sl/usermodel/Sheet.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
diff --git a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
index ec31b5cc65..ec31b5cc65 100644
--- a/src/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/Slide.java b/main/src/main/java/org/apache/poi/sl/usermodel/Slide.java
index 7c0d566138..7c0d566138 100644
--- a/src/java/org/apache/poi/sl/usermodel/Slide.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/Slide.java
diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShow.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
index 751379de92..751379de92 100644
--- a/src/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
index a32123afe5..a32123afe5 100644
--- a/src/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
diff --git a/src/java/org/apache/poi/sl/usermodel/SlideShowProvider.java b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
index 3dbde3cde5..3dbde3cde5 100644
--- a/src/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
diff --git a/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java b/main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java
index 500dffde4e..500dffde4e 100644
--- a/src/java/org/apache/poi/sl/usermodel/StrokeStyle.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TabStop.java b/main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java
index 479b1fec44..479b1fec44 100644
--- a/src/java/org/apache/poi/sl/usermodel/TabStop.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TableCell.java b/main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java
index 4bc5e33278..4bc5e33278 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TableShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java
index 20f2dc3d76..20f2dc3d76 100644
--- a/src/java/org/apache/poi/sl/usermodel/TableShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TextBox.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
index 1405722b85..1405722b85 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TextParagraph.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java
index 354b357b94..354b357b94 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextParagraph.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TextRun.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
index 7dfd4933d8..7dfd4933d8 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextRun.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
diff --git a/src/java/org/apache/poi/sl/usermodel/TextShape.java b/main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java
index 8219836281..8219836281 100644
--- a/src/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java
diff --git a/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java b/main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
index f302d8288f..f302d8288f 100644
--- a/src/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
+++ b/main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
diff --git a/src/java/org/apache/poi/ss/SpreadsheetVersion.java b/main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java
index 200175d04b..200175d04b 100644
--- a/src/java/org/apache/poi/ss/SpreadsheetVersion.java
+++ b/main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java
diff --git a/src/java/org/apache/poi/ss/extractor/EmbeddedData.java b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java
index 0e598b3175..0e598b3175 100644
--- a/src/java/org/apache/poi/ss/extractor/EmbeddedData.java
+++ b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java
diff --git a/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
index dbce0249ea..dbce0249ea 100644
--- a/src/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
+++ b/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
diff --git a/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java b/main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java
index 9adc35cb84..9adc35cb84 100644
--- a/src/java/org/apache/poi/ss/extractor/ExcelExtractor.java
+++ b/main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java
diff --git a/src/java/org/apache/poi/ss/format/CellDateFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
index 94a4f46710..94a4f46710 100644
--- a/src/java/org/apache/poi/ss/format/CellDateFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
index 4a5e370e86..4a5e370e86 100644
--- a/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormat.java b/main/src/main/java/org/apache/poi/ss/format/CellFormat.java
index 86a1dabf4f..86a1dabf4f 100644
--- a/src/java/org/apache/poi/ss/format/CellFormat.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormat.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormatCondition.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java
index 96e9c5fcd8..96e9c5fcd8 100644
--- a/src/java/org/apache/poi/ss/format/CellFormatCondition.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormatPart.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
index c03dbc5795..c03dbc5795 100644
--- a/src/java/org/apache/poi/ss/format/CellFormatPart.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormatResult.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java
index a22f77c277..a22f77c277 100644
--- a/src/java/org/apache/poi/ss/format/CellFormatResult.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormatType.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatType.java
index af947b1db4..af947b1db4 100644
--- a/src/java/org/apache/poi/ss/format/CellFormatType.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormatType.java
diff --git a/src/java/org/apache/poi/ss/format/CellFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellFormatter.java
index e3ff5c5527..e3ff5c5527 100644
--- a/src/java/org/apache/poi/ss/format/CellFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java
index 2233c284aa..2233c284aa 100644
--- a/src/java/org/apache/poi/ss/format/CellGeneralFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
index f25965af75..f25965af75 100644
--- a/src/java/org/apache/poi/ss/format/CellNumberFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
index a9af31851f..a9af31851f 100644
--- a/src/java/org/apache/poi/ss/format/CellNumberPartHandler.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
diff --git a/src/java/org/apache/poi/ss/format/CellNumberStringMod.java b/main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java
index 30c10f1258..30c10f1258 100644
--- a/src/java/org/apache/poi/ss/format/CellNumberStringMod.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java
diff --git a/src/java/org/apache/poi/ss/format/CellTextFormatter.java b/main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java
index 3537520c46..3537520c46 100644
--- a/src/java/org/apache/poi/ss/format/CellTextFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java
diff --git a/src/java/org/apache/poi/ss/format/SimpleFraction.java b/main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
index dec5a275f3..dec5a275f3 100644
--- a/src/java/org/apache/poi/ss/format/SimpleFraction.java
+++ b/main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
diff --git a/src/java/org/apache/poi/ss/format/package-info.java b/main/src/main/java/org/apache/poi/ss/format/package-info.java
index 71f14cb2b3..71f14cb2b3 100644
--- a/src/java/org/apache/poi/ss/format/package-info.java
+++ b/main/src/main/java/org/apache/poi/ss/format/package-info.java
diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
index fa9989c02b..fa9989c02b 100644
--- a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java
index 2716e24084..2716e24084 100644
--- a/src/java/org/apache/poi/ss/formula/CacheAreaEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java
diff --git a/src/java/org/apache/poi/ss/formula/CellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java
index 22db400533..22db400533 100644
--- a/src/java/org/apache/poi/ss/formula/CellCacheEntry.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java
diff --git a/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java b/main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
index b9c7efc678..b9c7efc678 100644
--- a/src/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
diff --git a/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java b/main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
index 65ef78c205..65ef78c205 100644
--- a/src/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
diff --git a/src/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
index 269b8f292a..269b8f292a 100644
--- a/src/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/DataValidationEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
index c49d5f0e3c..c49d5f0e3c 100644
--- a/src/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationCache.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java
index 451ccc7ba3..451ccc7ba3 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationCache.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationCell.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java
index ae983d11d8..ae983d11d8 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationCell.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
index afb4a09f9d..afb4a09f9d 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationName.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java
index e43ab76c46..e43ab76c46 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationName.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationSheet.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java
index 881f00fafd..881f00fafd 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationSheet.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationTracker.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java
index a69386389c..a69386389c 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationTracker.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java
diff --git a/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
index 2a6aed0751..2a6aed0751 100644
--- a/src/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
diff --git a/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java b/main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
index ce6bf0efdb..ce6bf0efdb 100644
--- a/src/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
diff --git a/src/java/org/apache/poi/ss/formula/Formula.java b/main/src/main/java/org/apache/poi/ss/formula/Formula.java
index cc32a63ad4..cc32a63ad4 100644
--- a/src/java/org/apache/poi/ss/formula/Formula.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/Formula.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCache.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java
index fc097eb884..fc097eb884 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaCellCache.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
index 9dbb7248c8..9dbb7248c8 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
index 9a40cbc95e..9a40cbc95e 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaParseException.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
index 4b1040f16d..4b1040f16d 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaParseException.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaParser.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
index a05166e29e..a05166e29e 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaParser.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
index 1d0c275b91..1d0c275b91 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaRenderer.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java
index c247b1b61e..c247b1b61e 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaRenderer.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
index 94b791d31f..94b791d31f 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaShifter.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java
index ed2589d754..ed2589d754 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaShifter.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaType.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaType.java
index fa154e6d42..fa154e6d42 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaType.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaType.java
diff --git a/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java b/main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
index 005c91dfac..005c91dfac 100644
--- a/src/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
diff --git a/src/java/org/apache/poi/ss/formula/IEvaluationListener.java b/main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java
index 6182a28cfd..6182a28cfd 100644
--- a/src/java/org/apache/poi/ss/formula/IEvaluationListener.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java
diff --git a/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java b/main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java
index e4576a7c4d..e4576a7c4d 100644
--- a/src/java/org/apache/poi/ss/formula/IStabilityClassifier.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java
diff --git a/src/java/org/apache/poi/ss/formula/LazyAreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java
index f10cfe6de9..f10cfe6de9 100644
--- a/src/java/org/apache/poi/ss/formula/LazyAreaEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java
diff --git a/src/java/org/apache/poi/ss/formula/LazyRefEval.java b/main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java
index 4456c23a62..4456c23a62 100644
--- a/src/java/org/apache/poi/ss/formula/LazyRefEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java
diff --git a/src/java/org/apache/poi/ss/formula/NameIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java
index 4245afff18..4245afff18 100644
--- a/src/java/org/apache/poi/ss/formula/NameIdentifier.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java
diff --git a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java
index 341919af58..341919af58 100644
--- a/src/java/org/apache/poi/ss/formula/OperandClassTransformer.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java
diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
index fcb1ccf9f2..fcb1ccf9f2 100644
--- a/src/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
index ca10b13075..ca10b13075 100644
--- a/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
diff --git a/src/java/org/apache/poi/ss/formula/ParseNode.java b/main/src/main/java/org/apache/poi/ss/formula/ParseNode.java
index a41ec26346..a41ec26346 100644
--- a/src/java/org/apache/poi/ss/formula/ParseNode.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ParseNode.java
diff --git a/src/java/org/apache/poi/ss/formula/PlainCellCache.java b/main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java
index 0bf2ca4c3a..0bf2ca4c3a 100644
--- a/src/java/org/apache/poi/ss/formula/PlainCellCache.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java
diff --git a/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java b/main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
index 171b12e179..171b12e179 100644
--- a/src/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
diff --git a/src/java/org/apache/poi/ss/formula/SharedFormula.java b/main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java
index ed7e58b3bd..ed7e58b3bd 100644
--- a/src/java/org/apache/poi/ss/formula/SharedFormula.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java
index 69f6f99501..69f6f99501 100644
--- a/src/java/org/apache/poi/ss/formula/SheetIdentifier.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java b/main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
index cff04f3249..cff04f3249 100644
--- a/src/java/org/apache/poi/ss/formula/SheetNameFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetRange.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRange.java
index ab7ccab83a..ab7ccab83a 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRange.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetRange.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
index 3ee1d77df5..3ee1d77df5 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
index 68dbb9be3f..68dbb9be3f 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
index 88c91991b9..88c91991b9 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
diff --git a/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
index 2324eda75b..2324eda75b 100644
--- a/src/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/ThreeDEval.java b/main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java
index 0bda63749c..0bda63749c 100644
--- a/src/java/org/apache/poi/ss/formula/ThreeDEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java
diff --git a/src/java/org/apache/poi/ss/formula/TwoDEval.java b/main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java
index f3c8c974f5..f3c8c974f5 100644
--- a/src/java/org/apache/poi/ss/formula/TwoDEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java
diff --git a/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java b/main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java
index c526137554..c526137554 100644
--- a/src/java/org/apache/poi/ss/formula/UserDefinedFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
index 59bd2a1a80..59bd2a1a80 100644
--- a/src/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
index 8cb4cbf26b..8cb4cbf26b 100644
--- a/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
index dd6f09bd17..dd6f09bd17 100644
--- a/src/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java b/main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
index 096f6b2ed2..096f6b2ed2 100644
--- a/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
index 0c3f537dd6..0c3f537dd6 100644
--- a/src/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/DateParser.java b/main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java
index a8419bc51f..a8419bc51f 100644
--- a/src/java/org/apache/poi/ss/formula/atp/DateParser.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/IfError.java b/main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java
index 9e405e3c23..9e405e3c23 100644
--- a/src/java/org/apache/poi/ss/formula/atp/IfError.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/MRound.java b/main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java
index 73f5ab320b..73f5ab320b 100644
--- a/src/java/org/apache/poi/ss/formula/atp/MRound.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
index e01ba84793..e01ba84793 100644
--- a/src/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java
index b59b4808b5..b59b4808b5 100644
--- a/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/RandBetween.java b/main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java
index 79f1c0acea..79f1c0acea 100644
--- a/src/java/org/apache/poi/ss/formula/atp/RandBetween.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
index 666501d540..666501d540 100644
--- a/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
index d4eff0261f..d4eff0261f 100644
--- a/src/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/YearFrac.java b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java
index a4f14b5436..a4f14b5436 100644
--- a/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java
diff --git a/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
index aba00e7f6b..aba00e7f6b 100644
--- a/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
diff --git a/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java b/main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
index 2d49270d0d..2d49270d0d 100644
--- a/src/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
diff --git a/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
index 3d8fb50c84..3d8fb50c84 100644
--- a/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/AreaEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
index c2ce411685..c2ce411685 100644
--- a/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
index 96633318d9..96633318d9 100644
--- a/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/BlankEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java
index 845e7deaab..845e7deaab 100644
--- a/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/BoolEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java
index 49fe3cf2a4..49fe3cf2a4 100644
--- a/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java
index 5622be8705..5622be8705 100644
--- a/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
index 31d08d05e5..31d08d05e5 100644
--- a/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java
index e094df4649..e094df4649 100644
--- a/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
index cd813fb96f..cd813fb96f 100644
--- a/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
index da670439a9..da670439a9 100644
--- a/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
index 82e0296399..82e0296399 100644
--- a/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
index 4063790c73..4063790c73 100644
--- a/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
index 70d25040f4..70d25040f4 100644
--- a/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
index 9d81f8ce36..9d81f8ce36 100644
--- a/src/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
index 182e53b153..182e53b153 100644
--- a/src/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/NumberEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java
index 87d425356b..87d425356b 100644
--- a/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
index c6dcf1dc27..c6dcf1dc27 100644
--- a/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
index 59a383c3e1..59a383c3e1 100644
--- a/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/PercentEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
index d6162e54c0..d6162e54c0 100644
--- a/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/RangeEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java
index 617d20a765..617d20a765 100644
--- a/src/java/org/apache/poi/ss/formula/eval/RangeEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/RefEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java
index 46aa96c04c..46aa96c04c 100644
--- a/src/java/org/apache/poi/ss/formula/eval/RefEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
index bd96c4eb81..bd96c4eb81 100644
--- a/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/RefListEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java
index 99d9b3e841..99d9b3e841 100644
--- a/src/java/org/apache/poi/ss/formula/eval/RefListEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
index 2a9f2e34a7..2a9f2e34a7 100644
--- a/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/StringEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java
index 61515e438f..61515e438f 100644
--- a/src/java/org/apache/poi/ss/formula/eval/StringEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java
index 4e1b712fbc..4e1b712fbc 100644
--- a/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java b/main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
index 8d15ebea93..8d15ebea93 100644
--- a/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
index 8107c48544..8107c48544 100644
--- a/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
index 81b36aad40..81b36aad40 100644
--- a/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/ValueEval.java b/main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java
index c1309a7df6..c1309a7df6 100644
--- a/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
index 7a25291325..7a25291325 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
index 73fbe00a7a..73fbe00a7a 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
index 8ba3aeef75..8ba3aeef75 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
diff --git a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
index b85cc15ea9..b85cc15ea9 100644
--- a/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
index 0be53f555e..0be53f555e 100644
--- a/src/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
index fa8ca34aca..fa8ca34aca 100644
--- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
index dc83e9c601..dc83e9c601 100644
--- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
diff --git a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
index bb01b41163..bb01b41163 100644
--- a/src/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Address.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Address.java
index ea5244c1eb..ea5244c1eb 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Address.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Address.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
index 5eb90c3417..5eb90c3417 100644
--- a/src/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Areas.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
index 6d06c6375e..6d06c6375e 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Areas.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/ArrayFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
index 0e842fc5c9..0e842fc5c9 100644
--- a/src/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/ArrayMode.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java
index 1d9916b80c..1d9916b80c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/ArrayMode.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
index c39d082e10..c39d082e10 100644
--- a/src/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Baseifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java
index 88ce9e3f4c..88ce9e3f4c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Baseifs.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
index 69a01fe69c..69a01fe69c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
index 5177b851a6..5177b851a6 100644
--- a/src/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
index 28af57a2a5..28af57a2a5 100644
--- a/src/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Choose.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java
index 127ffd43d7..127ffd43d7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Choose.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Code.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Code.java
index f285d58580..f285d58580 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Code.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Code.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Column.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Column.java
index 9c152bb17f..9c152bb17f 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Column.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Column.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Columns.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java
index 3c1fdc54a2..3c1fdc54a2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Columns.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Complex.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
index b616eba7a7..b616eba7a7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Complex.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Count.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Count.java
index 25c0799054..25c0799054 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Count.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Count.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/CountUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java
index 5dae60f946..5dae60f946 100644
--- a/src/java/org/apache/poi/ss/formula/functions/CountUtils.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Counta.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java
index c725f012a2..c725f012a2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Counta.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Countblank.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java
index af2016f807..af2016f807 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Countblank.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Countif.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
index 1f37d2e433..1f37d2e433 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Countif.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Countifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java
index 0ac50635aa..0ac50635aa 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Countifs.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DGet.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java
index 78b1b9235e..78b1b9235e 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DGet.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DMax.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java
index 4d442f0415..4d442f0415 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DMax.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DMin.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java
index 61b75768c7..61b75768c7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DMin.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
index 295721b4dd..295721b4dd 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DSum.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java
index 26604677de..26604677de 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DSum.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DateFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java
index 7068bea935..7068bea935 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DateFunc.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/DateValue.java b/main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
index fa241a7389..fa241a7389 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DateValue.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Days360.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java
index e86b23be89..e86b23be89 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Days360.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
index cbac6b2ebf..cbac6b2ebf 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
index 299068d4c1..299068d4c1 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Delta.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
index 4fd112f4b0..4fd112f4b0 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Delta.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/EDate.java b/main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java
index 3faec3dd84..3faec3dd84 100644
--- a/src/java/org/apache/poi/ss/formula/functions/EDate.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/EOMonth.java b/main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
index f0c5c4bb5b..f0c5c4bb5b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/EOMonth.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Errortype.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
index 71565fdef0..71565fdef0 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Errortype.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Even.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Even.java
index f691265324..f691265324 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Even.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Even.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/FactDouble.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
index 8c3394854d..8c3394854d 100644
--- a/src/java/org/apache/poi/ss/formula/functions/FactDouble.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Finance.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java
index a1b0604ff0..a1b0604ff0 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Finance.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
index 988007386b..988007386b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java
index dc4917f5e2..dc4917f5e2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/FinanceLib.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java
index 364a05824c..364a05824c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
index dbb1695ba7..dbb1695ba7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
index 0b3317d5be..0b3317d5be 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
index 0ba3d40de8..0ba3d40de8 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
index 421a398022..421a398022 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
index e3f8ace412..e3f8ace412 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
index b7affe2a2f..b7affe2a2f 100644
--- a/src/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Frequency.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
index 9df832366d..9df832366d 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Frequency.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function.java
index 5f97b81a24..5f97b81a24 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java
index 749053ea15..749053ea15 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function0Arg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java
index ec214f4f09..ec214f4f09 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function1Arg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java
index bd395cc51e..bd395cc51e 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function2Arg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java
index ad5eee1586..ad5eee1586 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function3Arg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java
index f0eee52241..f0eee52241 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Function4Arg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
index c3b1341d91..c3b1341d91 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Hlookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java
index 5658ec49ec..5658ec49ec 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Hlookup.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java
index c69c0b47cb..c69c0b47cb 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Hyperlink.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
index 111964a4c4..111964a4c4 100644
--- a/src/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/IPMT.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java
index 35dca8a2f6..35dca8a2f6 100644
--- a/src/java/org/apache/poi/ss/formula/functions/IPMT.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/IfFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java
index c73e13a1cc..c73e13a1cc 100644
--- a/src/java/org/apache/poi/ss/formula/functions/IfFunc.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/ImReal.java b/main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
index c5a6e15a51..c5a6e15a51 100644
--- a/src/java/org/apache/poi/ss/formula/functions/ImReal.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Imaginary.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
index a030107207..a030107207 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Imaginary.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Index.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Index.java
index 2dc6622d05..2dc6622d05 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Index.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Index.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Indirect.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
index ee44b9435d..ee44b9435d 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Indirect.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Intercept.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
index 89542e2dab..89542e2dab 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Intercept.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Irr.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java
index 7430335a0a..7430335a0a 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Irr.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
index 513daa3a1b..513daa3a1b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
index 9df2803c3c..9df2803c3c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Lookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java
index 0b20ab36d7..0b20ab36d7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Lookup.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java b/main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
index 9af09c301b..9af09c301b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Match.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Match.java
index 4a61476657..4a61476657 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Match.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Match.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/MathX.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
index c88923faf6..c88923faf6 100644
--- a/src/java/org/apache/poi/ss/formula/functions/MathX.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
index 4159ddcd98..4159ddcd98 100644
--- a/src/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
index 247192273c..247192273c 100644
--- a/src/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Mirr.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java
index 764be8ac5b..764be8ac5b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Mirr.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Mode.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java
index 978c9cad38..978c9cad38 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Mode.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
index 5e3670c784..5e3670c784 100644
--- a/src/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Na.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Na.java
index 3224867704..3224867704 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Na.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Na.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
index 50e6237003..50e6237003 100644
--- a/src/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Now.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Now.java
index e0fcf22fd3..e0fcf22fd3 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Now.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Now.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Npv.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java
index 1c19b84c1e..1c19b84c1e 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Npv.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
index 39adf4c8cd..39adf4c8cd 100644
--- a/src/java/org/apache/poi/ss/formula/functions/NumericFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
index ae34904e02..ae34904e02 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Odd.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java
index 6762fcb5f7..6762fcb5f7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Odd.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Offset.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java
index 75aac0e780..75aac0e780 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Offset.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/PPMT.java b/main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java
index 2df2304db1..2df2304db1 100644
--- a/src/java/org/apache/poi/ss/formula/functions/PPMT.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Quotient.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
index 9bac12fc3d..9bac12fc3d 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Quotient.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Rank.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java
index 97d0700e15..97d0700e15 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Rank.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Rate.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java
index d0a840f6b7..d0a840f6b7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Rate.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Replace.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java
index 5b4eeabef2..5b4eeabef2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Replace.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Rept.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
index 50dc559fab..50dc559fab 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Rept.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Roman.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
index f822990dc3..f822990dc3 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Roman.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/RowFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java
index 17d7acfdfe..17d7acfdfe 100644
--- a/src/java/org/apache/poi/ss/formula/functions/RowFunc.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Rows.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java
index 1e363222ab..1e363222ab 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Rows.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Single.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Single.java
index 38e8a20fdc..38e8a20fdc 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Single.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Single.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Slope.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
index cb8b07aee7..cb8b07aee7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Slope.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/StatsLib.java b/main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java
index 528a14c511..528a14c511 100644
--- a/src/java/org/apache/poi/ss/formula/functions/StatsLib.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Substitute.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java
index 69d5cf5ec8..69d5cf5ec8 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Substitute.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Subtotal.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
index 8d7084be83..8d7084be83 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Subtotal.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumif.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java
index ceeff9b1d1..ceeff9b1d1 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumif.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumifs.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java
index 862930d438..862930d438 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumifs.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java
index aea1fdb8ad..aea1fdb8ad 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumproduct.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
index 28887a5bf0..28887a5bf0 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
index cae17d7e35..cae17d7e35 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
index 1d5effa0cc..1d5effa0cc 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/T.java b/main/src/main/java/org/apache/poi/ss/formula/functions/T.java
index 28895d0ad2..28895d0ad2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/T.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/T.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/TextFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java
index f344d57ca5..f344d57ca5 100644
--- a/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java
index 8423919e1a..8423919e1a 100644
--- a/src/java/org/apache/poi/ss/formula/functions/TimeFunc.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Today.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Today.java
index 677d1f0e48..677d1f0e48 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Today.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Today.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Trend.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java
index 62eb545670..62eb545670 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Trend.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Value.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Value.java
index d2a1f24fc7..d2a1f24fc7 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Value.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Value.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
index 1938b79d3b..1938b79d3b 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
index cf3f350d6e..cf3f350d6e 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
index e701b2d9a2..e701b2d9a2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/Vlookup.java b/main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java
index a2daa856e4..a2daa856e4 100644
--- a/src/java/org/apache/poi/ss/formula/functions/Vlookup.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/WeekNum.java b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
index eec44cc86f..eec44cc86f 100644
--- a/src/java/org/apache/poi/ss/formula/functions/WeekNum.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
index 184866e7c2..184866e7c2 100644
--- a/src/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
diff --git a/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java b/main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
index da2a0f3127..da2a0f3127 100644
--- a/src/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
diff --git a/src/java/org/apache/poi/ss/formula/package-info.java b/main/src/main/java/org/apache/poi/ss/formula/package-info.java
index 68eb7e42f2..68eb7e42f2 100644
--- a/src/java/org/apache/poi/ss/formula/package-info.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/package-info.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
index bc77d6049b..bc77d6049b 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java
index 13f6b76a86..13f6b76a86 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AddPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
index 456909d59f..456909d59f 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
index cb3aaa2234..cb3aaa2234 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
index 729fc0e742..729fc0e742 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
index 911abbf5bc..911abbf5bc 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaI.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java
index 3610126628..3610126628 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AreaI.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
index 0ac7d5e74d..0ac7d5e74d 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
index 2e25703786..2e25703786 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
index 5fbefc365e..5fbefc365e 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
index f242fb2b39..f242fb2b39 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
index aff4aa3918..aff4aa3918 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
index 99e0ea0c10..99e0ea0c10 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
index a94986f7fe..a94986f7fe 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
index 84777f2091..84777f2091 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
index a206b5dbe9..a206b5dbe9 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
index b58b8e5298..b58b8e5298 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
index 1143dc5e7b..1143dc5e7b 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
index 04908988d1..04908988d1 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java
index 6a69ff2df6..6a69ff2df6 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/DividePtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
index b95a4b4262..b95a4b4262 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
index 6cb5d41803..6cb5d41803 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
index 6c125e652c..6c125e652c 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
index 2717662d2b..2717662d2b 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
index 9fbcc89690..9fbcc89690 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
index b13381ac22..b13381ac22 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
index 386249eb89..386249eb89 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
index a58e6e2cc6..a58e6e2cc6 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java
index 977c8b6bc4..977c8b6bc4 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/IntPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
index 963564ad71..963564ad71 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
index f66987a3ca..f66987a3ca 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
index 5e5731654d..5e5731654d 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
index 18a00eed8b..18a00eed8b 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
index 41adefcaff..41adefcaff 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
index 548f15f1b4..548f15f1b4 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
index bb80961b6a..bb80961b6a 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
index 6a785c1a07..6a785c1a07 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java
index aee1997509..aee1997509 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/NamePtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
index 5ca85df72f..5ca85df72f 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
index 8ed4c9c43f..8ed4c9c43f 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
index 15313a4a77..15313a4a77 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
index ed6f15f1ee..ed6f15f1ee 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
index 1f1ab3c761..1f1ab3c761 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
index 111f58b4e6..111f58b4e6 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
index 050924088d..050924088d 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
index bf7eb0a152..bf7eb0a152 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
index 05883c4c3a..05883c4c3a 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ptg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
index 3651ab93b2..3651ab93b2 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Ptg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Pxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java
index fa1c4ff07e..fa1c4ff07e 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Pxg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
index 49083fe150..49083fe150 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java
index 25b145a3cb..25b145a3cb 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/RangePtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
index 911e2583ce..911e2583ce 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
index 7096921c43..7096921c43 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
index cebc0dcd6a..cebc0dcd6a 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
index 06c8489276..06c8489276 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
index c8e2b0a31e..c8e2b0a31e 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java
index 1068bb8fe0..1068bb8fe0 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/RefPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
index 6c6c9df463..6c6c9df463 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
index 310ffb2b1d..310ffb2b1d 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
index 379ae2b72f..379ae2b72f 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/StringPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
index d3e1f6e44b..d3e1f6e44b 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java
index 63a2aa759e..63a2aa759e 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/TblPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
index 0deeb7a8ae..0deeb7a8ae 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
index f1c1d96abd..f1c1d96abd 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
index da3175f56f..da3175f56f 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
index bd92b9b56e..bd92b9b56e 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
index 1eff73a826..1eff73a826 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
diff --git a/src/java/org/apache/poi/ss/formula/ptg/package-info.java b/main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java
index e2e6da8b03..e2e6da8b03 100644
--- a/src/java/org/apache/poi/ss/formula/ptg/package-info.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java
diff --git a/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
index 593a0ee1b5..593a0ee1b5 100644
--- a/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
diff --git a/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
index 4234054583..4234054583 100644
--- a/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
diff --git a/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
index c5af8d5254..c5af8d5254 100644
--- a/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
diff --git a/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java b/main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java
index 28614498e8..28614498e8 100644
--- a/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
+++ b/main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java
diff --git a/src/java/org/apache/poi/ss/usermodel/AutoFilter.java b/main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java
index 2b8c2446c5..2b8c2446c5 100644
--- a/src/java/org/apache/poi/ss/usermodel/AutoFilter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/BorderExtent.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java
index 7115883b35..7115883b35 100644
--- a/src/java/org/apache/poi/ss/usermodel/BorderExtent.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java
diff --git a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java
index 985a215409..985a215409 100644
--- a/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/BorderStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java
index 9fd5d15cbd..9fd5d15cbd 100644
--- a/src/java/org/apache/poi/ss/usermodel/BorderStyle.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java
diff --git a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
index c430888178..c430888178 100644
--- a/src/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Cell.java b/main/src/main/java/org/apache/poi/ss/usermodel/Cell.java
index 5e3918f3d3..5e3918f3d3 100644
--- a/src/java/org/apache/poi/ss/usermodel/Cell.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Cell.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellBase.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
index 726c9bd82b..726c9bd82b 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellBase.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
index 8aea65ad23..8aea65ad23 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellRange.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java
index 4868dd8e81..4868dd8e81 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellRange.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
index 8417887f5f..8417887f5f 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellType.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellType.java
index c8e81c9c1a..c8e81c9c1a 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CellValue.java b/main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java
index da8b0cc502..da8b0cc502 100644
--- a/src/java/org/apache/poi/ss/usermodel/CellValue.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ChildAnchor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java
index 92a0469e52..92a0469e52 100644
--- a/src/java/org/apache/poi/ss/usermodel/ChildAnchor.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java
index 77c09c17b0..77c09c17b0 100644
--- a/src/java/org/apache/poi/ss/usermodel/ClientAnchor.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Color.java b/main/src/main/java/org/apache/poi/ss/usermodel/Color.java
index 29555a1849..29555a1849 100644
--- a/src/java/org/apache/poi/ss/usermodel/Color.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Color.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
index 8bdbb07355..8bdbb07355 100644
--- a/src/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Comment.java b/main/src/main/java/org/apache/poi/ss/usermodel/Comment.java
index c39040cfe3..c39040cfe3 100644
--- a/src/java/org/apache/poi/ss/usermodel/Comment.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Comment.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java b/main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
index 80f70d315a..80f70d315a 100644
--- a/src/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionFilterData.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
index 2d532e31fc..2d532e31fc 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionFilterType.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
index 5f68e689d9..5f68e689d9 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionType.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
index a5681cd4b9..a5681cd4b9 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
index d7789e14ea..d7789e14ea 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
index 2f19d9e3e5..2f19d9e3e5 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
index 5e534442e0..5e534442e0 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
diff --git a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
index c70e3d1d24..c70e3d1d24 100644
--- a/src/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
diff --git a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java b/main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java
index 004025db10..004025db10 100644
--- a/src/java/org/apache/poi/ss/usermodel/CreationHelper.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
index bcdd34a6d2..bcdd34a6d2 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
index d40a8d11c5..d40a8d11c5 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java
index 3728541ef6..3728541ef6 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataFormat.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
index 78bbd79b55..78bbd79b55 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidation.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java
index c80ed6a744..c80ed6a744 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataValidation.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
index 38f78e8681..38f78e8681 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
index 2e749467e4..2e749467e4 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Date1904Support.java b/main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java
index db9cdd3b69..db9cdd3b69 100644
--- a/src/java/org/apache/poi/ss/usermodel/Date1904Support.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DateUtil.java b/main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
index ea95436c06..ea95436c06 100644
--- a/src/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
diff --git a/src/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java b/main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
index ce6ad535e6..ce6ad535e6 100644
--- a/src/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Drawing.java b/main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java
index 8147ff6635..8147ff6635 100644
--- a/src/java/org/apache/poi/ss/usermodel/Drawing.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
index 891c63e8d1..891c63e8d1 100644
--- a/src/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
index ee544f7c9a..ee544f7c9a 100644
--- a/src/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
index fcaed994d5..fcaed994d5 100644
--- a/src/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java b/main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
index 616a61709d..616a61709d 100644
--- a/src/java/org/apache/poi/ss/usermodel/ExtendedColor.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FillPatternType.java b/main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java
index 0612c928cf..0612c928cf 100644
--- a/src/java/org/apache/poi/ss/usermodel/FillPatternType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Font.java b/main/src/main/java/org/apache/poi/ss/usermodel/Font.java
index 60b8a91dc2..60b8a91dc2 100644
--- a/src/java/org/apache/poi/ss/usermodel/Font.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Font.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FontCharset.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java
index 24cb65f4e5..24cb65f4e5 100644
--- a/src/java/org/apache/poi/ss/usermodel/FontCharset.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FontFamily.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java
index 829246678e..829246678e 100644
--- a/src/java/org/apache/poi/ss/usermodel/FontFamily.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FontFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java
index cce523fe29..cce523fe29 100644
--- a/src/java/org/apache/poi/ss/usermodel/FontFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FontScheme.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java
index e1b7712309..e1b7712309 100644
--- a/src/java/org/apache/poi/ss/usermodel/FontScheme.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FontUnderline.java b/main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
index a78062b92b..a78062b92b 100644
--- a/src/java/org/apache/poi/ss/usermodel/FontUnderline.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Footer.java b/main/src/main/java/org/apache/poi/ss/usermodel/Footer.java
index f982b71e6e..f982b71e6e 100644
--- a/src/java/org/apache/poi/ss/usermodel/Footer.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Footer.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FormulaError.java b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java
index 996861e75a..996861e75a 100644
--- a/src/java/org/apache/poi/ss/usermodel/FormulaError.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
index 776c022d14..776c022d14 100644
--- a/src/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
diff --git a/src/java/org/apache/poi/ss/usermodel/FractionFormat.java b/main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
index c89838a5da..c89838a5da 100644
--- a/src/java/org/apache/poi/ss/usermodel/FractionFormat.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Header.java b/main/src/main/java/org/apache/poi/ss/usermodel/Header.java
index 22f38a665c..22f38a665c 100644
--- a/src/java/org/apache/poi/ss/usermodel/Header.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Header.java
diff --git a/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java b/main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java
index 41c0e9ea35..41c0e9ea35 100644
--- a/src/java/org/apache/poi/ss/usermodel/HeaderFooter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java b/main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
index 6b9a313261..6b9a313261 100644
--- a/src/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Hyperlink.java b/main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java
index c067cc002c..c067cc002c 100644
--- a/src/java/org/apache/poi/ss/usermodel/Hyperlink.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java
diff --git a/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
index d99630996f..d99630996f 100644
--- a/src/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java b/main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
index 2843de4de3..2843de4de3 100644
--- a/src/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/IndexedColors.java b/main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java
index 19053f1cc1..19053f1cc1 100644
--- a/src/java/org/apache/poi/ss/usermodel/IndexedColors.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Name.java b/main/src/main/java/org/apache/poi/ss/usermodel/Name.java
index 03e13a83d9..03e13a83d9 100644
--- a/src/java/org/apache/poi/ss/usermodel/Name.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Name.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ObjectData.java b/main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java
index 3d21b1a8d2..3d21b1a8d2 100644
--- a/src/java/org/apache/poi/ss/usermodel/ObjectData.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PageOrder.java b/main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java
index c3faf36b3e..c3faf36b3e 100644
--- a/src/java/org/apache/poi/ss/usermodel/PageOrder.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PaperSize.java b/main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java
index abd65f3eaa..abd65f3eaa 100644
--- a/src/java/org/apache/poi/ss/usermodel/PaperSize.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java
index 0eb0c589c7..0eb0c589c7 100644
--- a/src/java/org/apache/poi/ss/usermodel/PatternFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Picture.java b/main/src/main/java/org/apache/poi/ss/usermodel/Picture.java
index ac7d33dd21..ac7d33dd21 100644
--- a/src/java/org/apache/poi/ss/usermodel/Picture.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Picture.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PictureData.java b/main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java
index 67d3cefcd1..67d3cefcd1 100644
--- a/src/java/org/apache/poi/ss/usermodel/PictureData.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java
index ecbea6dafe..ecbea6dafe 100644
--- a/src/java/org/apache/poi/ss/usermodel/PrintCellComments.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java
index 8d5716f31e..8d5716f31e 100644
--- a/src/java/org/apache/poi/ss/usermodel/PrintOrientation.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java
diff --git a/src/java/org/apache/poi/ss/usermodel/PrintSetup.java b/main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java
index bba72c3951..bba72c3951 100644
--- a/src/java/org/apache/poi/ss/usermodel/PrintSetup.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java
diff --git a/src/java/org/apache/poi/ss/usermodel/RangeCopier.java b/main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java
index c6b82a6860..c6b82a6860 100644
--- a/src/java/org/apache/poi/ss/usermodel/RangeCopier.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ReadingOrder.java b/main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java
index 0544cb1542..0544cb1542 100644
--- a/src/java/org/apache/poi/ss/usermodel/ReadingOrder.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java
diff --git a/src/java/org/apache/poi/ss/usermodel/RichTextString.java b/main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java
index 551fede973..551fede973 100644
--- a/src/java/org/apache/poi/ss/usermodel/RichTextString.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Row.java b/main/src/main/java/org/apache/poi/ss/usermodel/Row.java
index ff27f4e826..ff27f4e826 100644
--- a/src/java/org/apache/poi/ss/usermodel/Row.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Row.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Shape.java b/main/src/main/java/org/apache/poi/ss/usermodel/Shape.java
index f9e3874a75..f9e3874a75 100644
--- a/src/java/org/apache/poi/ss/usermodel/Shape.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Shape.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ShapeContainer.java b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java
index d0867b9b07..d0867b9b07 100644
--- a/src/java/org/apache/poi/ss/usermodel/ShapeContainer.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java
diff --git a/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java
index 3c5747ee5a..3c5747ee5a 100644
--- a/src/java/org/apache/poi/ss/usermodel/ShapeTypes.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Sheet.java b/main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
index bc93818a5c..bc93818a5c 100644
--- a/src/java/org/apache/poi/ss/usermodel/Sheet.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
diff --git a/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java b/main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
index 98e2aa7846..98e2aa7846 100644
--- a/src/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
diff --git a/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java b/main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java
index 8f8ab9138a..8f8ab9138a 100644
--- a/src/java/org/apache/poi/ss/usermodel/SheetVisibility.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java
diff --git a/src/java/org/apache/poi/ss/usermodel/SimpleShape.java b/main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java
index fe97c850f3..fe97c850f3 100644
--- a/src/java/org/apache/poi/ss/usermodel/SimpleShape.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Table.java b/main/src/main/java/org/apache/poi/ss/usermodel/Table.java
index ef7fe33797..ef7fe33797 100644
--- a/src/java/org/apache/poi/ss/usermodel/Table.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Table.java
diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyle.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
index b4e5e19835..b4e5e19835 100644
--- a/src/java/org/apache/poi/ss/usermodel/TableStyle.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyleInfo.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
index a24ce05bd1..a24ce05bd1 100644
--- a/src/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
diff --git a/src/java/org/apache/poi/ss/usermodel/TableStyleType.java b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
index 870436a3b4..870436a3b4 100644
--- a/src/java/org/apache/poi/ss/usermodel/TableStyleType.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
diff --git a/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java b/main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
index f8976d1307..f8976d1307 100644
--- a/src/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
diff --git a/src/java/org/apache/poi/ss/usermodel/Workbook.java b/main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
index 156d1b0d7a..156d1b0d7a 100644
--- a/src/java/org/apache/poi/ss/usermodel/Workbook.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
index 3e9b887179..3e9b887179 100644
--- a/src/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
diff --git a/src/java/org/apache/poi/ss/usermodel/WorkbookProvider.java b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
index 12b8cc8dee..12b8cc8dee 100644
--- a/src/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
index a044932cb8..a044932cb8 100644
--- a/src/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
index c6d97f3ff6..c6d97f3ff6 100644
--- a/src/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
diff --git a/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
index 2c4b3fa507..2c4b3fa507 100644
--- a/src/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
+++ b/main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
diff --git a/src/java/org/apache/poi/ss/util/AreaReference.java b/main/src/main/java/org/apache/poi/ss/util/AreaReference.java
index ffe672f7ee..ffe672f7ee 100644
--- a/src/java/org/apache/poi/ss/util/AreaReference.java
+++ b/main/src/main/java/org/apache/poi/ss/util/AreaReference.java
diff --git a/src/java/org/apache/poi/ss/util/CellAddress.java b/main/src/main/java/org/apache/poi/ss/util/CellAddress.java
index f9129647d9..f9129647d9 100644
--- a/src/java/org/apache/poi/ss/util/CellAddress.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellAddress.java
diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddress.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
index 1a3bc11746..1a3bc11746 100644
--- a/src/java/org/apache/poi/ss/util/CellRangeAddress.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
index 7ae0eada45..7ae0eada45 100644
--- a/src/java/org/apache/poi/ss/util/CellRangeAddressBase.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddressList.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java
index c4ac6289b7..c4ac6289b7 100644
--- a/src/java/org/apache/poi/ss/util/CellRangeAddressList.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java
diff --git a/src/java/org/apache/poi/ss/util/CellRangeUtil.java b/main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java
index 3b8b5251d4..3b8b5251d4 100644
--- a/src/java/org/apache/poi/ss/util/CellRangeUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java
diff --git a/src/java/org/apache/poi/ss/util/CellReference.java b/main/src/main/java/org/apache/poi/ss/util/CellReference.java
index 6ba8c566de..6ba8c566de 100644
--- a/src/java/org/apache/poi/ss/util/CellReference.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellReference.java
diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/main/src/main/java/org/apache/poi/ss/util/CellUtil.java
index 4d5e3e01c7..4d5e3e01c7 100644
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/util/CellUtil.java
diff --git a/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java
index 47d1a04623..47d1a04623 100644
--- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java
+++ b/main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java
diff --git a/src/java/org/apache/poi/ss/util/DateParser.java b/main/src/main/java/org/apache/poi/ss/util/DateParser.java
index a69dae6383..a69dae6383 100644
--- a/src/java/org/apache/poi/ss/util/DateParser.java
+++ b/main/src/main/java/org/apache/poi/ss/util/DateParser.java
diff --git a/src/java/org/apache/poi/ss/util/ExpandedDouble.java b/main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java
index 40d4066af8..40d4066af8 100644
--- a/src/java/org/apache/poi/ss/util/ExpandedDouble.java
+++ b/main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java
diff --git a/src/java/org/apache/poi/ss/util/IEEEDouble.java b/main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java
index 91d8fea434..91d8fea434 100644
--- a/src/java/org/apache/poi/ss/util/IEEEDouble.java
+++ b/main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java
diff --git a/src/java/org/apache/poi/ss/util/ImageUtils.java b/main/src/main/java/org/apache/poi/ss/util/ImageUtils.java
index 2b6a013e02..2b6a013e02 100644
--- a/src/java/org/apache/poi/ss/util/ImageUtils.java
+++ b/main/src/main/java/org/apache/poi/ss/util/ImageUtils.java
diff --git a/src/java/org/apache/poi/ss/util/MutableFPNumber.java b/main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java
index 38594426b2..38594426b2 100644
--- a/src/java/org/apache/poi/ss/util/MutableFPNumber.java
+++ b/main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java
diff --git a/src/java/org/apache/poi/ss/util/NormalisedDecimal.java b/main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java
index 6c945f26b5..6c945f26b5 100644
--- a/src/java/org/apache/poi/ss/util/NormalisedDecimal.java
+++ b/main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java
diff --git a/src/java/org/apache/poi/ss/util/NumberComparer.java b/main/src/main/java/org/apache/poi/ss/util/NumberComparer.java
index 31be44e834..31be44e834 100644
--- a/src/java/org/apache/poi/ss/util/NumberComparer.java
+++ b/main/src/main/java/org/apache/poi/ss/util/NumberComparer.java
diff --git a/src/java/org/apache/poi/ss/util/NumberToTextConverter.java b/main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java
index 7023063de2..7023063de2 100644
--- a/src/java/org/apache/poi/ss/util/NumberToTextConverter.java
+++ b/main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java
diff --git a/src/java/org/apache/poi/ss/util/PaneInformation.java b/main/src/main/java/org/apache/poi/ss/util/PaneInformation.java
index dc54b4cf3c..dc54b4cf3c 100644
--- a/src/java/org/apache/poi/ss/util/PaneInformation.java
+++ b/main/src/main/java/org/apache/poi/ss/util/PaneInformation.java
diff --git a/src/java/org/apache/poi/ss/util/PropertyTemplate.java b/main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
index b19ea9f713..b19ea9f713 100644
--- a/src/java/org/apache/poi/ss/util/PropertyTemplate.java
+++ b/main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
diff --git a/src/java/org/apache/poi/ss/util/RegionUtil.java b/main/src/main/java/org/apache/poi/ss/util/RegionUtil.java
index 7846d015a8..7846d015a8 100644
--- a/src/java/org/apache/poi/ss/util/RegionUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/util/RegionUtil.java
diff --git a/src/java/org/apache/poi/ss/util/SSCellRange.java b/main/src/main/java/org/apache/poi/ss/util/SSCellRange.java
index 766e2e3564..766e2e3564 100644
--- a/src/java/org/apache/poi/ss/util/SSCellRange.java
+++ b/main/src/main/java/org/apache/poi/ss/util/SSCellRange.java
diff --git a/src/java/org/apache/poi/ss/util/SheetBuilder.java b/main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
index 32fdb134a3..32fdb134a3 100644
--- a/src/java/org/apache/poi/ss/util/SheetBuilder.java
+++ b/main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
diff --git a/src/java/org/apache/poi/ss/util/SheetUtil.java b/main/src/main/java/org/apache/poi/ss/util/SheetUtil.java
index 06d3aa1f70..06d3aa1f70 100644
--- a/src/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/util/SheetUtil.java
diff --git a/src/java/org/apache/poi/ss/util/WorkbookUtil.java b/main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java
index 8475a0d53c..8475a0d53c 100644
--- a/src/java/org/apache/poi/ss/util/WorkbookUtil.java
+++ b/main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java
diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
index 9fb4542c7d..9fb4542c7d 100644
--- a/src/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
+++ b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
index d26d7a9864..d26d7a9864 100644
--- a/src/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
+++ b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
diff --git a/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
index f22bd6f584..f22bd6f584 100644
--- a/src/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
+++ b/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
diff --git a/src/java/org/apache/poi/util/ArrayUtil.java b/main/src/main/java/org/apache/poi/util/ArrayUtil.java
index 1ebaae0215..1ebaae0215 100644
--- a/src/java/org/apache/poi/util/ArrayUtil.java
+++ b/main/src/main/java/org/apache/poi/util/ArrayUtil.java
diff --git a/src/java/org/apache/poi/util/Beta.java b/main/src/main/java/org/apache/poi/util/Beta.java
index 0f0d808b77..0f0d808b77 100644
--- a/src/java/org/apache/poi/util/Beta.java
+++ b/main/src/main/java/org/apache/poi/util/Beta.java
diff --git a/src/java/org/apache/poi/util/BitField.java b/main/src/main/java/org/apache/poi/util/BitField.java
index c9d669d92f..c9d669d92f 100644
--- a/src/java/org/apache/poi/util/BitField.java
+++ b/main/src/main/java/org/apache/poi/util/BitField.java
diff --git a/src/java/org/apache/poi/util/BitFieldFactory.java b/main/src/main/java/org/apache/poi/util/BitFieldFactory.java
index e35c80cacc..e35c80cacc 100644
--- a/src/java/org/apache/poi/util/BitFieldFactory.java
+++ b/main/src/main/java/org/apache/poi/util/BitFieldFactory.java
diff --git a/src/java/org/apache/poi/util/BoundedInputStream.java b/main/src/main/java/org/apache/poi/util/BoundedInputStream.java
index df63cbc11b..df63cbc11b 100644
--- a/src/java/org/apache/poi/util/BoundedInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/BoundedInputStream.java
diff --git a/src/java/org/apache/poi/util/ByteField.java b/main/src/main/java/org/apache/poi/util/ByteField.java
index ca62277918..ca62277918 100644
--- a/src/java/org/apache/poi/util/ByteField.java
+++ b/main/src/main/java/org/apache/poi/util/ByteField.java
diff --git a/src/java/org/apache/poi/util/CloseIgnoringInputStream.java b/main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java
index 82247b13af..82247b13af 100644
--- a/src/java/org/apache/poi/util/CloseIgnoringInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java
diff --git a/src/java/org/apache/poi/util/CodePageUtil.java b/main/src/main/java/org/apache/poi/util/CodePageUtil.java
index 2c1480253d..2c1480253d 100644
--- a/src/java/org/apache/poi/util/CodePageUtil.java
+++ b/main/src/main/java/org/apache/poi/util/CodePageUtil.java
diff --git a/src/java/org/apache/poi/util/Configurator.java b/main/src/main/java/org/apache/poi/util/Configurator.java
index b82ad9b8c7..b82ad9b8c7 100644
--- a/src/java/org/apache/poi/util/Configurator.java
+++ b/main/src/main/java/org/apache/poi/util/Configurator.java
diff --git a/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java b/main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
index 0252b4b684..0252b4b684 100644
--- a/src/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
+++ b/main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
diff --git a/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java b/main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java
index 6dd4930b9a..6dd4930b9a 100644
--- a/src/java/org/apache/poi/util/DelayableLittleEndianOutput.java
+++ b/main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java
diff --git a/src/java/org/apache/poi/util/Dimension2DDouble.java b/main/src/main/java/org/apache/poi/util/Dimension2DDouble.java
index 227c0cddd5..227c0cddd5 100644
--- a/src/java/org/apache/poi/util/Dimension2DDouble.java
+++ b/main/src/main/java/org/apache/poi/util/Dimension2DDouble.java
diff --git a/src/java/org/apache/poi/util/DocumentFormatException.java b/main/src/main/java/org/apache/poi/util/DocumentFormatException.java
index e53202235c..e53202235c 100644
--- a/src/java/org/apache/poi/util/DocumentFormatException.java
+++ b/main/src/main/java/org/apache/poi/util/DocumentFormatException.java
diff --git a/src/java/org/apache/poi/util/DrawingDump.java b/main/src/main/java/org/apache/poi/util/DrawingDump.java
index 72d9580b65..72d9580b65 100644
--- a/src/java/org/apache/poi/util/DrawingDump.java
+++ b/main/src/main/java/org/apache/poi/util/DrawingDump.java
diff --git a/src/java/org/apache/poi/util/FixedField.java b/main/src/main/java/org/apache/poi/util/FixedField.java
index 45d6c6f714..45d6c6f714 100644
--- a/src/java/org/apache/poi/util/FixedField.java
+++ b/main/src/main/java/org/apache/poi/util/FixedField.java
diff --git a/src/java/org/apache/poi/util/FontMetricsDumper.java b/main/src/main/java/org/apache/poi/util/FontMetricsDumper.java
index 321f0d5ea9..321f0d5ea9 100644
--- a/src/java/org/apache/poi/util/FontMetricsDumper.java
+++ b/main/src/main/java/org/apache/poi/util/FontMetricsDumper.java
diff --git a/src/java/org/apache/poi/util/GenericRecordJsonWriter.java b/main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
index c46a535a0b..c46a535a0b 100644
--- a/src/java/org/apache/poi/util/GenericRecordJsonWriter.java
+++ b/main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
diff --git a/src/java/org/apache/poi/util/GenericRecordUtil.java b/main/src/main/java/org/apache/poi/util/GenericRecordUtil.java
index 50a6f3b59a..50a6f3b59a 100644
--- a/src/java/org/apache/poi/util/GenericRecordUtil.java
+++ b/main/src/main/java/org/apache/poi/util/GenericRecordUtil.java
diff --git a/src/java/org/apache/poi/util/GenericRecordXmlWriter.java b/main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
index c5a949cc63..c5a949cc63 100644
--- a/src/java/org/apache/poi/util/GenericRecordXmlWriter.java
+++ b/main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
diff --git a/src/java/org/apache/poi/util/HexDump.java b/main/src/main/java/org/apache/poi/util/HexDump.java
index 184c48bd1e..184c48bd1e 100644
--- a/src/java/org/apache/poi/util/HexDump.java
+++ b/main/src/main/java/org/apache/poi/util/HexDump.java
diff --git a/src/java/org/apache/poi/util/HexRead.java b/main/src/main/java/org/apache/poi/util/HexRead.java
index c6a5fb4f73..c6a5fb4f73 100644
--- a/src/java/org/apache/poi/util/HexRead.java
+++ b/main/src/main/java/org/apache/poi/util/HexRead.java
diff --git a/src/java/org/apache/poi/util/IOUtils.java b/main/src/main/java/org/apache/poi/util/IOUtils.java
index 974efdf64b..974efdf64b 100644
--- a/src/java/org/apache/poi/util/IOUtils.java
+++ b/main/src/main/java/org/apache/poi/util/IOUtils.java
diff --git a/src/java/org/apache/poi/util/IntList.java b/main/src/main/java/org/apache/poi/util/IntList.java
index f536e089e9..f536e089e9 100644
--- a/src/java/org/apache/poi/util/IntList.java
+++ b/main/src/main/java/org/apache/poi/util/IntList.java
diff --git a/src/java/org/apache/poi/util/IntMapper.java b/main/src/main/java/org/apache/poi/util/IntMapper.java
index 86d5b599ae..86d5b599ae 100644
--- a/src/java/org/apache/poi/util/IntMapper.java
+++ b/main/src/main/java/org/apache/poi/util/IntMapper.java
diff --git a/src/java/org/apache/poi/util/IntegerField.java b/main/src/main/java/org/apache/poi/util/IntegerField.java
index c86a008b77..c86a008b77 100644
--- a/src/java/org/apache/poi/util/IntegerField.java
+++ b/main/src/main/java/org/apache/poi/util/IntegerField.java
diff --git a/src/java/org/apache/poi/util/Internal.java b/main/src/main/java/org/apache/poi/util/Internal.java
index 565a908d7b..565a908d7b 100644
--- a/src/java/org/apache/poi/util/Internal.java
+++ b/main/src/main/java/org/apache/poi/util/Internal.java
diff --git a/src/java/org/apache/poi/util/LZWDecompresser.java b/main/src/main/java/org/apache/poi/util/LZWDecompresser.java
index 0ebae8a0ac..0ebae8a0ac 100644
--- a/src/java/org/apache/poi/util/LZWDecompresser.java
+++ b/main/src/main/java/org/apache/poi/util/LZWDecompresser.java
diff --git a/src/java/org/apache/poi/util/LittleEndian.java b/main/src/main/java/org/apache/poi/util/LittleEndian.java
index 0ef687298f..0ef687298f 100644
--- a/src/java/org/apache/poi/util/LittleEndian.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndian.java
diff --git a/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
index c1bbaabb73..c1bbaabb73 100644
--- a/src/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
diff --git a/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
index fe9949f1af..fe9949f1af 100644
--- a/src/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
diff --git a/src/java/org/apache/poi/util/LittleEndianConsts.java b/main/src/main/java/org/apache/poi/util/LittleEndianConsts.java
index 9f7e4a21a5..9f7e4a21a5 100644
--- a/src/java/org/apache/poi/util/LittleEndianConsts.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianConsts.java
diff --git a/src/java/org/apache/poi/util/LittleEndianInput.java b/main/src/main/java/org/apache/poi/util/LittleEndianInput.java
index c140c275d2..c140c275d2 100644
--- a/src/java/org/apache/poi/util/LittleEndianInput.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianInput.java
diff --git a/src/java/org/apache/poi/util/LittleEndianInputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
index a80597a267..a80597a267 100644
--- a/src/java/org/apache/poi/util/LittleEndianInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
diff --git a/src/java/org/apache/poi/util/LittleEndianOutput.java b/main/src/main/java/org/apache/poi/util/LittleEndianOutput.java
index 708d97bf4a..708d97bf4a 100644
--- a/src/java/org/apache/poi/util/LittleEndianOutput.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianOutput.java
diff --git a/src/java/org/apache/poi/util/LittleEndianOutputStream.java b/main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java
index 920ff40519..920ff40519 100644
--- a/src/java/org/apache/poi/util/LittleEndianOutputStream.java
+++ b/main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java
diff --git a/src/java/org/apache/poi/util/LocaleID.java b/main/src/main/java/org/apache/poi/util/LocaleID.java
index 975442b5bc..975442b5bc 100644
--- a/src/java/org/apache/poi/util/LocaleID.java
+++ b/main/src/main/java/org/apache/poi/util/LocaleID.java
diff --git a/src/java/org/apache/poi/util/LocaleUtil.java b/main/src/main/java/org/apache/poi/util/LocaleUtil.java
index 5e6619645c..5e6619645c 100644
--- a/src/java/org/apache/poi/util/LocaleUtil.java
+++ b/main/src/main/java/org/apache/poi/util/LocaleUtil.java
diff --git a/src/java/org/apache/poi/util/LongField.java b/main/src/main/java/org/apache/poi/util/LongField.java
index 9aeffb36ea..9aeffb36ea 100644
--- a/src/java/org/apache/poi/util/LongField.java
+++ b/main/src/main/java/org/apache/poi/util/LongField.java
diff --git a/src/java/org/apache/poi/util/NotImplemented.java b/main/src/main/java/org/apache/poi/util/NotImplemented.java
index e815c5d153..e815c5d153 100644
--- a/src/java/org/apache/poi/util/NotImplemented.java
+++ b/main/src/main/java/org/apache/poi/util/NotImplemented.java
diff --git a/src/java/org/apache/poi/util/RLEDecompressingInputStream.java b/main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
index 6bd7fef86e..6bd7fef86e 100644
--- a/src/java/org/apache/poi/util/RLEDecompressingInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
diff --git a/src/java/org/apache/poi/util/RecordFormatException.java b/main/src/main/java/org/apache/poi/util/RecordFormatException.java
index 65bea581ee..65bea581ee 100644
--- a/src/java/org/apache/poi/util/RecordFormatException.java
+++ b/main/src/main/java/org/apache/poi/util/RecordFormatException.java
diff --git a/src/java/org/apache/poi/util/Removal.java b/main/src/main/java/org/apache/poi/util/Removal.java
index 0b618998ef..0b618998ef 100644
--- a/src/java/org/apache/poi/util/Removal.java
+++ b/main/src/main/java/org/apache/poi/util/Removal.java
diff --git a/src/java/org/apache/poi/util/ReplacingInputStream.java b/main/src/main/java/org/apache/poi/util/ReplacingInputStream.java
index 6b157599fc..6b157599fc 100644
--- a/src/java/org/apache/poi/util/ReplacingInputStream.java
+++ b/main/src/main/java/org/apache/poi/util/ReplacingInputStream.java
diff --git a/src/java/org/apache/poi/util/ShortField.java b/main/src/main/java/org/apache/poi/util/ShortField.java
index 29d91df7f4..29d91df7f4 100644
--- a/src/java/org/apache/poi/util/ShortField.java
+++ b/main/src/main/java/org/apache/poi/util/ShortField.java
diff --git a/src/java/org/apache/poi/util/StaxHelper.java b/main/src/main/java/org/apache/poi/util/StaxHelper.java
index 9563666532..9563666532 100644
--- a/src/java/org/apache/poi/util/StaxHelper.java
+++ b/main/src/main/java/org/apache/poi/util/StaxHelper.java
diff --git a/src/java/org/apache/poi/util/StringCodepointsIterable.java b/main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java
index 5fb83935bb..5fb83935bb 100644
--- a/src/java/org/apache/poi/util/StringCodepointsIterable.java
+++ b/main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java
diff --git a/src/java/org/apache/poi/util/StringUtil.java b/main/src/main/java/org/apache/poi/util/StringUtil.java
index d281c63386..d281c63386 100644
--- a/src/java/org/apache/poi/util/StringUtil.java
+++ b/main/src/main/java/org/apache/poi/util/StringUtil.java
diff --git a/src/java/org/apache/poi/util/SuppressForbidden.java b/main/src/main/java/org/apache/poi/util/SuppressForbidden.java
index 1160cc20bd..1160cc20bd 100644
--- a/src/java/org/apache/poi/util/SuppressForbidden.java
+++ b/main/src/main/java/org/apache/poi/util/SuppressForbidden.java
diff --git a/src/java/org/apache/poi/util/TempFile.java b/main/src/main/java/org/apache/poi/util/TempFile.java
index e0a2eaca2d..e0a2eaca2d 100644
--- a/src/java/org/apache/poi/util/TempFile.java
+++ b/main/src/main/java/org/apache/poi/util/TempFile.java
diff --git a/src/java/org/apache/poi/util/TempFileCreationStrategy.java b/main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java
index d576f08857..d576f08857 100644
--- a/src/java/org/apache/poi/util/TempFileCreationStrategy.java
+++ b/main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java
diff --git a/src/java/org/apache/poi/util/Units.java b/main/src/main/java/org/apache/poi/util/Units.java
index 1aad77db8b..1aad77db8b 100644
--- a/src/java/org/apache/poi/util/Units.java
+++ b/main/src/main/java/org/apache/poi/util/Units.java
diff --git a/src/java/org/apache/poi/util/XMLHelper.java b/main/src/main/java/org/apache/poi/util/XMLHelper.java
index e27c976d28..e27c976d28 100644
--- a/src/java/org/apache/poi/util/XMLHelper.java
+++ b/main/src/main/java/org/apache/poi/util/XMLHelper.java
diff --git a/src/java/org/apache/poi/util/package-info.java b/main/src/main/java/org/apache/poi/util/package-info.java
index 268d5b83ee..268d5b83ee 100644
--- a/src/java/org/apache/poi/util/package-info.java
+++ b/main/src/main/java/org/apache/poi/util/package-info.java
diff --git a/src/java/org/apache/poi/wp/usermodel/CharacterRun.java b/main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java
index 28dc89016e..28dc89016e 100644
--- a/src/java/org/apache/poi/wp/usermodel/CharacterRun.java
+++ b/main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java
diff --git a/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java b/main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
index bca6b6658d..bca6b6658d 100644
--- a/src/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
+++ b/main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
diff --git a/src/java/org/apache/poi/wp/usermodel/Paragraph.java b/main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java
index be488a2ef8..be488a2ef8 100644
--- a/src/java/org/apache/poi/wp/usermodel/Paragraph.java
+++ b/main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java
diff --git a/src/multimodule/poi/java9/module-info.class b/main/src/main/java9/module-info.class
index 5d96fed54b..5d96fed54b 100644
--- a/src/multimodule/poi/java9/module-info.class
+++ b/main/src/main/java9/module-info.class
diff --git a/src/multimodule/poi/java9/module-info.java b/main/src/main/java9/module-info.java
index a94109211a..a94109211a 100644
--- a/src/multimodule/poi/java9/module-info.java
+++ b/main/src/main/java9/module-info.java
diff --git a/src/resources/main/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index c93493ce19..c93493ce19 100644
--- a/src/resources/main/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/src/resources/main/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index a911eb6cb4..a911eb6cb4 100644
--- a/src/resources/main/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/src/resources/main/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
index fe7fe8c2a7..fe7fe8c2a7 100644
--- a/src/resources/main/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
+++ b/main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
diff --git a/src/resources/main/font_metrics.properties b/main/src/main/resources/font_metrics.properties
index e521b0c51a..e521b0c51a 100644
--- a/src/resources/main/font_metrics.properties
+++ b/main/src/main/resources/font_metrics.properties
diff --git a/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml b/main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
index f3c3f2ca33..f3c3f2ca33 100644
--- a/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
+++ b/main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
index b56f65e238..b56f65e238 100644
--- a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
+++ b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt
index e3c8fc4d74..e3c8fc4d74 100644
--- a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadata.txt
+++ b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt
diff --git a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadataCetab.txt b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
index b0cf329429..b0cf329429 100644
--- a/src/resources/main/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
+++ b/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
diff --git a/src/resources/version/Version.java.template b/main/src/main/version/Version.java.template
index 716ec916bf..716ec916bf 100644
--- a/src/resources/version/Version.java.template
+++ b/main/src/main/version/Version.java.template
diff --git a/src/testcases/org/apache/poi/POIDataSamples.java b/main/src/test/java/org/apache/poi/POIDataSamples.java
index ddf66e25bf..ddf66e25bf 100644
--- a/src/testcases/org/apache/poi/POIDataSamples.java
+++ b/main/src/test/java/org/apache/poi/POIDataSamples.java
diff --git a/src/testcases/org/apache/poi/POITestCase.java b/main/src/test/java/org/apache/poi/POITestCase.java
index dbaae88889..dbaae88889 100644
--- a/src/testcases/org/apache/poi/POITestCase.java
+++ b/main/src/test/java/org/apache/poi/POITestCase.java
diff --git a/src/testcases/org/apache/poi/TestJDK12.java b/main/src/test/java/org/apache/poi/TestJDK12.java
index 53e272233b..53e272233b 100644
--- a/src/testcases/org/apache/poi/TestJDK12.java
+++ b/main/src/test/java/org/apache/poi/TestJDK12.java
diff --git a/src/testcases/org/apache/poi/TestPOIDocumentMain.java b/main/src/test/java/org/apache/poi/TestPOIDocumentMain.java
index c2c44529b8..c2c44529b8 100644
--- a/src/testcases/org/apache/poi/TestPOIDocumentMain.java
+++ b/main/src/test/java/org/apache/poi/TestPOIDocumentMain.java
diff --git a/src/testcases/org/apache/poi/TestPOITestCase.java b/main/src/test/java/org/apache/poi/TestPOITestCase.java
index 862d0d7e46..862d0d7e46 100644
--- a/src/testcases/org/apache/poi/TestPOITestCase.java
+++ b/main/src/test/java/org/apache/poi/TestPOITestCase.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
index 43edb89d0c..43edb89d0c 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherBSERecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
index a081f61c65..a081f61c65 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java b/main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
index 4957c063d5..4957c063d5 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherBoolProperty.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
index 9f24b6d18d..9f24b6d18d 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
index b931359e54..b931359e54 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
index f9ee5eaca1..f9ee5eaca1 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherClientDataRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
index df13975197..df13975197 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
index ad84a54585..ad84a54585 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherDgRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
index f8f8b58115..f8f8b58115 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherDggRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherDump.java b/main/src/test/java/org/apache/poi/ddf/TestEscherDump.java
index 088d346bae..088d346bae 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherDump.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherDump.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
index c09dc223c2..c09dc223c2 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherOptRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java b/main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
index 99f508224f..99f508224f 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherProperty.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java b/main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
index ec94ba15d4..ec94ba15d4 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherPropertyFactory.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
index 4e18b641d3..4e18b641d3 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherSpRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
index 8aa7aa86d9..8aa7aa86d9 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherSpgrRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
index 1aa96edc5c..1aa96edc5c 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
diff --git a/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java b/main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
index d84f8bccee..d84f8bccee 100644
--- a/src/testcases/org/apache/poi/ddf/TestUnknownEscherRecord.java
+++ b/main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
diff --git a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java b/main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
index 1cea118353..1cea118353 100644
--- a/src/testcases/org/apache/poi/hpsf/TestVariantSupport.java
+++ b/main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/POIFile.java b/main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
index 1420e35bab..1420e35bab 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/POIFile.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
index 6d95b38450..6d95b38450 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
index ac50ec591d..ac50ec591d 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestClassID.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
index 9ef1289461..9ef1289461 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
index 6205713fa3..6205713fa3 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestHPSFBugs.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
index f8fb0aad13..f8fb0aad13 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
index 13eb537fe2..13eb537fe2 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
index 4abf73547f..4abf73547f 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
index 85ae090206..85ae090206 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
index 06cf09cf3f..06cf09cf3f 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/main/src/test/java/org/apache/poi/hpsf/basic/Util.java
index c6ef7ae6c7..c6ef7ae6c7 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/Util.java
+++ b/main/src/test/java/org/apache/poi/hpsf/basic/Util.java
diff --git a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
index 85d7d02b89..85d7d02b89 100644
--- a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
+++ b/main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
index 5d80a26d53..5d80a26d53 100644
--- a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
+++ b/main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java b/main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
index 2fe3359d4d..2fe3359d4d 100644
--- a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
+++ b/main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java b/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
index 91481c80ec..91481c80ec 100644
--- a/src/testcases/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
index ee06b7d101..ee06b7d101 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
index 7c6cf1b1f5..7c6cf1b1f5 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
index 56be2c87af..56be2c87af 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestEFBiffViewer.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java b/main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
index a0cdaddcd2..a0cdaddcd2 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestFormulaViewer.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestReSave.java b/main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
index 868561df21..868561df21 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestReSave.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
diff --git a/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java b/main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
index 9eb6ebc255..9eb6ebc255 100644
--- a/src/testcases/org/apache/poi/hssf/dev/TestRecordLister.java
+++ b/main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
index 058e1eda09..058e1eda09 100644
--- a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
index 8bb1b6771c..8bb1b6771c 100644
--- a/src/testcases/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
index fcd9d81dbc..fcd9d81dbc 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
index 74ac31845d..74ac31845d 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
index 24fba3e492..24fba3e492 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
index 852f07e9de..852f07e9de 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
+++ b/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
index 7a5ceef5f1..7a5ceef5f1 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ b/main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
index 3fb037c93e..3fb037c93e 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
+++ b/main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
index 18138de8ed..18138de8ed 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
index 7dfcd66940..7dfcd66940 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingManager2.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
index 22cd1ee11c..22cd1ee11c 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
index efd3f5feff..efd3f5feff 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
index 0e8964daee..0e8964daee 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
index 8b41f96879..8b41f96879 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
index f9c06bbedb..f9c06bbedb 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserIf.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java b/main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
index 4ea06a42f4..4ea06a42f4 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestHSSFAnchor.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
index 32e3736d0c..32e3736d0c 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
index f36ee053a8..f36ee053a8 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestOperandClassTransformer.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/main/src/test/java/org/apache/poi/hssf/model/TestRVA.java
index 488a9e6fc5..488a9e6fc5 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestRVA.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestRVA.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java b/main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
index fde901216b..fde901216b 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestRowBlocksReader.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/main/src/test/java/org/apache/poi/hssf/model/TestSheet.java
index aef0c5e40b..aef0c5e40b 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java b/main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
index c58dd39849..c58dd39849 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheetAdditional.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
index ba63dc70b7..ba63dc70b7 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestWorkbook.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/model/TestWorkbookRecordList.java b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java
index bc610c42e8..bc610c42e8 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestWorkbookRecordList.java
+++ b/main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
index 8433fb4cb1..8433fb4cb1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestArrayRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
index 9c855f8b3e..9c855f8b3e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
index bbf5bf3549..bbf5bf3549 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBOFRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
index 700f415f07..700f415f07 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBoolErrRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
index 3ee14a90ba..3ee14a90ba 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
index 0a43dbfdb6..0a43dbfdb6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCFHeaderRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
index 81689f140c..81689f140c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
index 6d472b9c2b..6d472b9c2b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestColumnInfoRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
index 5fccfd0975..5fccfd0975 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
index c6ea64d6b6..c6ea64d6b6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDConRefRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
index 00b25ac225..00b25ac225 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDVALRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
index e7c97e86ec..e7c97e86ec 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
index bac766e08a..bac766e08a 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
index 0f936fd405..0f936fd405 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
index 0a69b6554f..0a69b6554f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEndSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
index 3578a8d99b..3578a8d99b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
index 6b0933cc31..6b0933cc31 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExtSSTRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
index f4d191d69f..f4d191d69f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
index 41372882c6..41372882c6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestExternalNameRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
index c6a9cd9581..c6a9cd9581 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
index 2dbaeb4818..2dbaeb4818 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
index 623588ffee..623588ffee 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFormulaRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
index 2804fe3d71..2804fe3d71 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
index a372d11685..a372d11685 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestHyperlinkRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
index 169efaf2ad..169efaf2ad 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
index 84946bd6b2..84946bd6b2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLabelRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
index afd988fb37..afd988fb37 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
index 7e9e1da0d0..7e9e1da0d0 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
index 9884379747..9884379747 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNameCommentRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
index 12da160752..12da160752 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNameRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
index b59541da10..b59541da10 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNoteRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
index 9aa690b79f..9aa690b79f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
index f797358de9..f797358de9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestObjRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
index 55fc393bde..55fc393bde 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPLVRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
index ac97d99d4e..ac97d99d4e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPaletteRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
index c20209cf5b..c20209cf5b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPaneRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
index 670e2fe70c..670e2fe70c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecalcIdRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
index 11f66367e1..11f66367e1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
index 9c7d6be428..9c7d6be428 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
index 0956350283..0956350283 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordInputStream.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
index 92e5abff02..92e5abff02 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSCLRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
index 7bde03cb06..7bde03cb06 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
index b2206b86b7..b2206b86b7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
index db0593f344..db0593f344 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
index 17855c08de..17855c08de 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
index 18d345213e..18d345213e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestStringRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
index ed47560caf..ed47560caf 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestStyleRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
index b10800d5a3..b10800d5a3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSubRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
index 1766c514dd..1766c514dd 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSupBookRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
index 58cd682df2..58cd682df2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTableRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
index 6af2622dcb..6af2622dcb 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
index 272b1802e1..272b1802e1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextObjectRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
index 773b8666c1..773b8666c1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
index 364e478932..364e478932 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestWriteAccessRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
index 93c62912a9..93c62912a9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
index b400b76c24..b400b76c24 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
index 6fae73f041..6fae73f041 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
index 8bfc6576c2..8bfc6576c2 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
index 243e1adc2e..243e1adc2e 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
index 41ad8fbcb5..41ad8fbcb5 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
index 31b4f92548..31b4f92548 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
index 38018f3627..38018f3627 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
diff --git a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java b/main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
index cb0a6a548b..cb0a6a548b 100644
--- a/src/testcases/org/apache/poi/hssf/record/cf/TestCellRange.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
index c0cb666800..c0cb666800 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
index 638b32635c..638b32635c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
index 7e1a07f651..7e1a07f651 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
index 06c03ee0ca..06c03ee0ca 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
index 0c77fbcf2d..0c77fbcf2d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
index 70b504c6ac..70b504c6ac 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
index 4a494d2f8b..4a494d2f8b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
index 975f6c998f..975f6c998f 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
index 87f020479b..87f020479b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
index 1341bce4b8..1341bce4b8 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
index a2eaa8fa43..a2eaa8fa43 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index e719910ddf..e719910ddf 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
index 8511d1cdf5..8511d1cdf5 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
index a146408400..a146408400 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
index 6ebf3a6191..6ebf3a6191 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
index 5042e5663d..5042e5663d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
index ca92378c8c..ca92378c8c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
index ca8ec3ca9b..ca8ec3ca9b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
index d5c995fd5b..d5c995fd5b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
index 89fd5e48e4..89fd5e48e4 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
index b21fd2d71d..b21fd2d71d 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
index 12c7cc7342..12c7cc7342 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
index cd0b87bbc8..cd0b87bbc8 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
index 2c9d42a8dc..2c9d42a8dc 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
index 30435c76b7..30435c76b7 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
index 1c6e886c90..1c6e886c90 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
index b4bad1d191..b4bad1d191 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
index f20184d3ba..f20184d3ba 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
index b75c579147..b75c579147 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
index 8aac948d0c..8aac948d0c 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
index 6e56904996..6e56904996 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
index 21f03302c6..21f03302c6 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
index 7628d9ce4f..7628d9ce4f 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
index dc1a0405bd..dc1a0405bd 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
index 8d1294fa9b..8d1294fa9b 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
index 0dc470d417..0dc470d417 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java b/main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
index 45151b90ff..45151b90ff 100644
--- a/src/testcases/org/apache/poi/hssf/record/common/TestUnicodeString.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
index 3cfe1dc277..3cfe1dc277 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
index ff6ac5d019..ff6ac5d019 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
index ee05e1a4f4..ee05e1a4f4 100644
--- a/src/testcases/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
+++ b/main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java b/main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
index c44b3c0c7b..c44b3c0c7b 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/FormulaExtractor.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
index 96196c146e..96196c146e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
index 20a55c32ab..20a55c32ab 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
index 22d0676d51..22d0676d51 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
index d467333ffc..d467333ffc 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
index 8a3008cb45..8a3008cb45 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBug42464.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
index b30f9f71ec..b30f9f71ec 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
index d80f000368..d80f000368 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCellStyle.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
index cb3d92d113..cb3d92d113 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCloneSheet.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
index 0f7d5788fe..0f7d5788fe 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
index 4a120b2ac6..4a120b2ac6 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestDataValidation.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
index 1617bd65ad..1617bd65ad 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
index 3ddac1b794..3ddac1b794 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
index e6aaf092b6..e6aaf092b6 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
index 2d8ff7e834..2d8ff7e834 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
index 7341a43b1f..7341a43b1f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFontDetails.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
index 0ddc016d29..0ddc016d29 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
index ef8cd2538a..ef8cd2538a 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
index 836ed32bae..836ed32bae 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index 57f0fbc19d..57f0fbc19d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
index a6555e3f6c..a6555e3f6c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFChart.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
index 1cc79736c1..1cc79736c1 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
index 66a5c308df..66a5c308df 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
index 181cd5052b..181cd5052b 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFComment.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
index b6a472ad38..b6a472ad38 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
index 98195b11d5..98195b11d5 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
index 4e2843ad22..4e2843ad22 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 2949dbeeee..2949dbeeee 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
index dfc64df1bb..dfc64df1bb 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
index 552e028aff..552e028aff 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
index e4859923ff..e4859923ff 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFont.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
index afe96936fd..afe96936fd 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
index a104bba25f..a104bba25f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
index 67cb04010d..67cb04010d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
index e3e6cea444..e3e6cea444 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFName.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
index 95364a33c2..95364a33c2 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
index 1f6460e920..1f6460e920 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
index 64b91fc516..64b91fc516 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
index b2a793f972..b2a793f972 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
index dd1de44da9..dd1de44da9 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
index 4b17b77a8e..4b17b77a8e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
index 44ae5b4fcf..44ae5b4fcf 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index b588f1375c..b588f1375c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index b6c9c918d2..b6c9c918d2 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
index 340211560d..340211560d 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
index 9333ac516a..9333ac516a 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
index d78c3bf660..d78c3bf660 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
index 33f6607988..33f6607988 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
index 5d08d77e4c..5d08d77e4c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
index ac4f32cb0e..ac4f32cb0e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
index d56c3d6134..d56c3d6134 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
index 6f8bc8dfbb..6f8bc8dfbb 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
index 1183c5f6b5..1183c5f6b5 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
index 6d62955f0c..6d62955f0c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
index 341be15819..341be15819 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestPatriarch.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
index 759e790a6f..759e790a6f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestPolygon.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
index f1e9f0ef1f..f1e9f0ef1f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
index 5bde759a5c..5bde759a5c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestRowStyle.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
index 428fb3030e..428fb3030e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
index b02fa4fc7a..b02fa4fc7a 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestShapeGroup.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
index 2bda96ce2c..2bda96ce2c 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestSheetHiding.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestText.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
index a7065cda2e..a7065cda2e 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestText.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
index 76701fd1dd..76701fd1dd 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
index 1ced954a27..1ced954a27 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java b/main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
index e3ca2f4247..e3ca2f4247 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
+++ b/main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java b/main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
index 1fe92ec022..1fe92ec022 100644
--- a/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
+++ b/main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestCellReference.java b/main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
index f761e251dd..f761e251dd 100644
--- a/src/testcases/org/apache/poi/hssf/util/TestCellReference.java
+++ b/main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java b/main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
index ff3ec06277..ff3ec06277 100644
--- a/src/testcases/org/apache/poi/hssf/util/TestHSSFColor.java
+++ b/main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
diff --git a/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java b/main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
index 15190f93ab..15190f93ab 100644
--- a/src/testcases/org/apache/poi/hssf/util/TestRKUtil.java
+++ b/main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
index 959565cfeb..959565cfeb 100644
--- a/src/testcases/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
+++ b/main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
index 22452a0efd..22452a0efd 100644
--- a/src/testcases/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
+++ b/main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
diff --git a/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java b/main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java
index 2bca550236..2bca550236 100644
--- a/src/testcases/org/apache/poi/poifs/crypt/TestXorEncryption.java
+++ b/main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java
diff --git a/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java b/main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
index 42a607c130..42a607c130 100644
--- a/src/testcases/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
+++ b/main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
diff --git a/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java b/main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
index 1fa1802bea..1fa1802bea 100644
--- a/src/testcases/org/apache/poi/poifs/dev/TestPOIFSDump.java
+++ b/main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
index 4b597c1719..4b597c1719 100644
--- a/src/testcases/org/apache/poi/poifs/eventfilesystem/Listener.java
+++ b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
index 1eb939f961..1eb939f961 100644
--- a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
+++ b/main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java b/main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
index ed2ce941ab..ed2ce941ab 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
index f818d21978..f818d21978 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/SlowInputStream.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
index 9212aa6c8f..9212aa6c8f 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
index 15edc14e92..15edc14e92 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestDocument.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
index 17c1b572d5..17c1b572d5 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
index c0d4de1353..c0d4de1353 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
index d2815e0254..d2815e0254 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
index c594fb513d..c594fb513d 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
index b85550cc15..b85550cc15 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java
index 456ca076ac..456ca076ac 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestFileMagic.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
index ef504aca69..ef504aca69 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
index aa9c8883af..aa9c8883af 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
index 42d6534dc6..42d6534dc6 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
index 8e4dd48298..8e4dd48298 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
index 6becf23aa1..6becf23aa1 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
index 94d8e73e9c..94d8e73e9c 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
index c644fb1c60..c644fb1c60 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
index fcc1e4bcf1..fcc1e4bcf1 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
index 2a2a8122d1..2a2a8122d1 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
index 29ed3001f0..29ed3001f0 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java
+++ b/main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
diff --git a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java
index 57e9ed814e..57e9ed814e 100644
--- a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java
+++ b/main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java
diff --git a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java b/main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
index 3845ce75fe..3845ce75fe 100644
--- a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
+++ b/main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
diff --git a/src/testcases/org/apache/poi/poifs/property/LocalProperty.java b/main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
index f578129b68..f578129b68 100644
--- a/src/testcases/org/apache/poi/poifs/property/LocalProperty.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
index 49b6553012..49b6553012 100644
--- a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
index 17145cd9db..17145cd9db 100644
--- a/src/testcases/org/apache/poi/poifs/property/TestDocumentProperty.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
index 6d67310ff6..6d67310ff6 100644
--- a/src/testcases/org/apache/poi/poifs/property/TestPropertyFactory.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
index e6ce6610f5..e6ce6610f5 100644
--- a/src/testcases/org/apache/poi/poifs/property/TestPropertyTable.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
diff --git a/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java b/main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
index 4b311a8ec8..4b311a8ec8 100644
--- a/src/testcases/org/apache/poi/poifs/property/TestRootProperty.java
+++ b/main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java b/main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
index 13a1c52306..13a1c52306 100644
--- a/src/testcases/org/apache/poi/poifs/storage/LocalProperty.java
+++ b/main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java b/main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
index b04741fb06..b04741fb06 100644
--- a/src/testcases/org/apache/poi/poifs/storage/RawDataUtil.java
+++ b/main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java b/main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
index 8190b151b6..8190b151b6 100644
--- a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java
+++ b/main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
diff --git a/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java b/main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
index bb08ae3965..bb08ae3965 100644
--- a/src/testcases/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
+++ b/main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestFormulaParser.java b/main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java
index a99041c852..a99041c852 100644
--- a/src/testcases/org/apache/poi/sl/draw/geom/TestFormulaParser.java
+++ b/main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java
diff --git a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
index 28849f77e9..28849f77e9 100644
--- a/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
+++ b/main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
index 81f5931f34..81f5931f34 100644
--- a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
+++ b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
diff --git a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
index 090aeb0aa8..090aeb0aa8 100644
--- a/src/testcases/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
+++ b/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
diff --git a/src/testcases/org/apache/poi/ss/ITestDataProvider.java b/main/src/test/java/org/apache/poi/ss/ITestDataProvider.java
index e258e1a4a2..e258e1a4a2 100644
--- a/src/testcases/org/apache/poi/ss/ITestDataProvider.java
+++ b/main/src/test/java/org/apache/poi/ss/ITestDataProvider.java
diff --git a/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java b/main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
index 4da0ab5b05..4da0ab5b05 100644
--- a/src/testcases/org/apache/poi/ss/TestSpreadsheetVersion.java
+++ b/main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
index 3c0476a9c3..3c0476a9c3 100644
--- a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java
+++ b/main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
index bf4cafc714..bf4cafc714 100644
--- a/src/testcases/org/apache/poi/ss/format/TestCellFormatCondition.java
+++ b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java
index 7f19b7dcb6..7f19b7dcb6 100644
--- a/src/testcases/org/apache/poi/ss/format/TestCellFormatResult.java
+++ b/main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java
diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
index 4e6bb88d4a..4e6bb88d4a 100644
--- a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java b/main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
index 2e05261cf3..2e05261cf3 100644
--- a/src/testcases/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
diff --git a/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java b/main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
index 3524c3f7d0..3524c3f7d0 100644
--- a/src/testcases/org/apache/poi/ss/formula/EvaluationListener.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
diff --git a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java b/main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
index 507cbc854c..507cbc854c 100644
--- a/src/testcases/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java b/main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
index 11b08fade6..11b08fade6 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestCellCacheEntry.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
index 5f7c6a76d2..5f7c6a76d2 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java b/main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
index 37e2131ee0..37e2131ee0 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java b/main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
index 5bb859ce34..5bb859ce34 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestFunctionRegistry.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java b/main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
index dc05d792f4..dc05d792f4 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestPlainCellCache.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java b/main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
index 484e5597cb..484e5597cb 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestSheetNameFormatter.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
index 39eafbe65f..39eafbe65f 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java b/main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
index 673cb9500c..673cb9500c 100644
--- a/src/testcases/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
index 8214390798..8214390798 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
index 2e99276f7f..2e99276f7f 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestMRound.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
index 7ee0476b3c..7ee0476b3c 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
index 9af99fb0ee..9af99fb0ee 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestPercentile.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
index 83d54ef446..83d54ef446 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
index 598b3119b7..598b3119b7 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
index e2e73bad04..e2e73bad04 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
index 57875af9cd..57875af9cd 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
index 1ac4f2576b..1ac4f2576b 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java b/main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
index 0f9c0ee60a..0f9c0ee60a 100644
--- a/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java b/main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
index 74de1ca32c..74de1ca32c 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java b/main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
index 4a15444773..4a15444773 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/EvalInstances.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
index 40b9a09715..40b9a09715 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
index 3155ba5b37..3155ba5b37 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestDivideEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
index 8d8e29f2f0..8d8e29f2f0 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestEqualEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
index e4eba2c296..e4eba2c296 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestExternalFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
index b82532592d..b82532592d 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
index 80ddc6d988..80ddc6d988 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
index 90d9739efb..90d9739efb 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
index f5a73d186d..f5a73d186d 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
index a89db5837f..a89db5837f 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
index 68e634f1cd..68e634f1cd 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
index f37b818142..f37b818142 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestOperandResolver.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
index 3727cc1c71..3727cc1c71 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPowerEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java
index 78b0d49ac8..78b0d49ac8 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestPowerEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
index f67d8a92ff..f67d8a92ff 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java b/main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
index febecbe359..febecbe359 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java b/main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
index 5c3dcb9875..5c3dcb9875 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
index db87e07377..db87e07377 100644
--- a/src/testcases/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
index c408dd527b..c408dd527b 100644
--- a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
index 29853a410d..29853a410d 100644
--- a/src/testcases/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
index c95eae8871..c95eae8871 100644
--- a/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
index c26220dbd8..c26220dbd8 100644
--- a/src/testcases/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
index a39599c526..a39599c526 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
index d5e02e0de8..d5e02e0de8 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java b/main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
index 345b4fb80c..345b4fb80c 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java b/main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
index bf49dad45d..bf49dad45d 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java b/main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
index 05cfdfc8a2..05cfdfc8a2 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
index 766ccc303e..766ccc303e 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java
index 3137614d3a..3137614d3a 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestAreas.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
index bfee8f6ad6..bfee8f6ad6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestAverage.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java
index e873ba227c..e873ba227c 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestBin2Dec.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
index bb9a238eaa..bb9a238eaa 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
index b59eb221a4..b59eb221a4 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
index 1ab4f90ea0..1ab4f90ea0 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
index 32dd466ba8..32dd466ba8 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCode.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
index 213aeca067..213aeca067 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
index 018e2222f3..018e2222f3 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestComplex.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
index 3318832fc1..3318832fc1 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
index 6b351fbe0d..6b351fbe0d 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
index 393334c5da..393334c5da 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
index f7d20532c6..f7d20532c6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
index 82d0e82742..82d0e82742 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
index 4f0e9ee7ba..4f0e9ee7ba 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java
index fe487b6815..fe487b6815 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDateValue.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
index b796a4d5b9..b796a4d5b9 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDays360.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java
index d745603a5a..d745603a5a 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Bin.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
index 125f9c4396..125f9c4396 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDec2Hex.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
index 83aee557f3..83aee557f3 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDelta.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
index aa1bf1f0c5..aa1bf1f0c5 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
index d55fdcf5e8..d55fdcf5e8 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestEDate.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java
index c1e1349909..c1e1349909 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestEOMonth.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
index 9e9394c791..9e9394c791 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
index e0d2aca4c5..e0d2aca4c5 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFinanceLib.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
index 31e50331d0..31e50331d0 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java
index 63f01cdbb6..63f01cdbb6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
index 907ecf7cc1..907ecf7cc1 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java
index 6dd04d13c1..6dd04d13c1 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFrequency.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java
index 681b9e00dc..681b9e00dc 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestGeomean.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
index ba5bae0b1f..ba5bae0b1f 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestHex2Dec.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
index 3614200239..3614200239 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
index e11a2b87c1..e11a2b87c1 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIPMT.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
index 4d226fa26a..4d226fa26a 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
index ea1fe44b1f..ea1fe44b1f 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
index b39e396c04..b39e396c04 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndex.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
index 8bf6ffc1a9..8bf6ffc1a9 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
index 45422e19e7..45422e19e7 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
index f3a8cccb4f..f3a8cccb4f 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
index 03dac3cef2..03dac3cef2 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIntercept.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
index 6764ebdc2b..6764ebdc2b 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
index 9f6ece060c..9f6ece060c 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
index 4bf92c7196..4bf92c7196 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLeftRight.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
index b4d8aa7a13..b4d8aa7a13 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLen.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
index 8825f01814..8825f01814 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
index 84deb0fc7b..84deb0fc7b 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
index 84d3674b70..84d3674b70 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
index 3721c688df..3721c688df 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMatch.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
index 7f6f8ca2e6..7f6f8ca2e6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
index e408fceb7e..e408fceb7e 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMathX.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
index 866c65fb4a..866c65fb4a 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMid.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
index f640cb54ee..f640cb54ee 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
index 3c6e88a273..3c6e88a273 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
index 9f958f0205..9f958f0205 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
index 191ff37fef..191ff37fef 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestNpv.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
index 89c19277d2..89c19277d2 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestOct2Dec.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
index fd2ada7b97..fd2ada7b97 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestOffset.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
index 0b908063fc..0b908063fc 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestPPMT.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
index 0640450a03..0640450a03 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestPmt.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
index 35ee88c29d..35ee88c29d 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestPoisson.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java
index 7f5bc5a1dc..7f5bc5a1dc 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestProduct.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
index 15968199b5..15968199b5 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotient.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
index bbbfba1882..bbbfba1882 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
index 90da6fdb0a..90da6fdb0a 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestRank.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
index 0e87b38210..0e87b38210 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
index 2a7132e813..2a7132e813 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
index ffe0c75c00..ffe0c75c00 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
index 4450528822..4450528822 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
index eb2812e0e4..eb2812e0e4 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestRowCol.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
index 5c8bc1eb33..5c8bc1eb33 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSlope.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
index 9fb322f978..9fb322f978 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestStatsLib.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java
index 3735232878..3735232878 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSubstitute.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
index 3f4eb88dd8..3f4eb88dd8 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSubtotal.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
index 4bd60295a8..4bd60295a8 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSumif.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
index 6aa1962953..6aa1962953 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSumifs.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
index 35ee48d26c..35ee48d26c 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestSumproduct.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
index 03cb480e47..03cb480e47 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTFunc.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
index ddcdd35165..ddcdd35165 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
index d45787b2a5..d45787b2a5 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTime.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
index 55398d31cb..55398d31cb 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
index efee41b996..efee41b996 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTrim.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
index 6e1d5d8cac..6e1d5d8cac 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTrunc.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
index 3cac14426d..3cac14426d 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
index a733f243de..a733f243de 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestValue.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
index 3719d93b35..3719d93b35 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
index b918d0490e..b918d0490e 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
index d1c48a265f..d1c48a265f 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java b/main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
index b97e80171e..b97e80171e 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/BaseTestPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
index 8e566bf929..8e566bf929 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
index 3d99bc3e6d..3d99bc3e6d 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
index 51b8c32f28..51b8c32f28 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
index 91e76c08ef..91e76c08ef 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
index ea5a2cee50..ea5a2cee50 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
index c5a1b44bd0..c5a1b44bd0 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
index 142f4a574f..142f4a574f 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
index bddba7ff54..bddba7ff54 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
index fedc639764..fedc639764 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
index 0c582c5cf7..0c582c5cf7 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
index fd6027fa93..fd6027fa93 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
index 2eb91217cb..2eb91217cb 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
index 91ed33b1e9..91ed33b1e9 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
index 7a806f15cd..7a806f15cd 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
index 6ff906c96c..6ff906c96c 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
index 2a1b44e6fc..2a1b44e6fc 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
index f4170286ca..f4170286ca 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
index 7b85995a02..7b85995a02 100644
--- a/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
diff --git a/src/testcases/org/apache/poi/ss/formula/udf/TestUDFFinder.java b/main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java
index 9628c0af97..9628c0af97 100644
--- a/src/testcases/org/apache/poi/ss/formula/udf/TestUDFFinder.java
+++ b/main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
index dbd7e5fc46..dbd7e5fc46 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index bcd8bf272a..bcd8bf272a 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
index d8a54cfa54..d8a54cfa54 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
index 25bd602c51..25bd602c51 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCellComment.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
index 7d9cd0c448..7d9cd0c448 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
index 9acd338e11..9acd338e11 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
index 4d3954fa78..4d3954fa78 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
index 65ee8ffa49..65ee8ffa49 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
index ccfd8293c0..ccfd8293c0 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
index d0d2b0c535..d0d2b0c535 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFont.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
index 6c0e20c888..6c0e20c888 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
index 44a33c3f20..44a33c3f20 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
index 60a676fc7b..60a676fc7b 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
index d79e594857..d79e594857 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
index 6610623545..6610623545 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
index c2205d240c..c2205d240c 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
index 947bd71a9f..947bd71a9f 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
index 3afec95478..3afec95478 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
index 5d09f30016..5d09f30016 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
index 9a1a463363..9a1a463363 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 67d351bffc..67d351bffc 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
index 8f67877635..8f67877635 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
index 11bb3c9357..11bb3c9357 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
index 08fbae584e..08fbae584e 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
index da68a86b20..da68a86b20 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java
index 615e2f1d72..615e2f1d72 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestDateUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
index e27557e9b9..e27557e9b9 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
index 7a45018569..7a45018569 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestFractionFormat.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
index 202ffae308..202ffae308 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java b/main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java
index d336ea95cd..d336ea95cd 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestIndexedColors.java
+++ b/main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java
diff --git a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
index caef1acf52..caef1acf52 100644
--- a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java b/main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
index d8664487ce..d8664487ce 100644
--- a/src/testcases/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
+++ b/main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java b/main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
index 925f968b37..925f968b37 100644
--- a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java
+++ b/main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
index 0014a1f539..0014a1f539 100644
--- a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
+++ b/main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
diff --git a/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java b/main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
index 1dcedc97a2..1dcedc97a2 100644
--- a/src/testcases/org/apache/poi/ss/util/NumberToTextConversionExamples.java
+++ b/main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestAreaReference.java b/main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
index e8419d5306..e8419d5306 100644
--- a/src/testcases/org/apache/poi/ss/util/TestAreaReference.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellAddress.java b/main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java
index 044203f3c2..044203f3c2 100644
--- a/src/testcases/org/apache/poi/ss/util/TestCellAddress.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
index 01d12f41c3..01d12f41c3 100644
--- a/src/testcases/org/apache/poi/ss/util/TestCellRangeAddress.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java
index 5b402a3bcd..5b402a3bcd 100644
--- a/src/testcases/org/apache/poi/ss/util/TestCellRangeUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestCellReference.java b/main/src/test/java/org/apache/poi/ss/util/TestCellReference.java
index 0d2d791374..0d2d791374 100644
--- a/src/testcases/org/apache/poi/ss/util/TestCellReference.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestCellReference.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java b/main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
index befe219a16..befe219a16 100644
--- a/src/testcases/org/apache/poi/ss/util/TestDateFormatConverter.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestDateParser.java b/main/src/test/java/org/apache/poi/ss/util/TestDateParser.java
index 28e51d1b67..28e51d1b67 100644
--- a/src/testcases/org/apache/poi/ss/util/TestDateParser.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestDateParser.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java b/main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
index 9465619b79..9465619b79 100644
--- a/src/testcases/org/apache/poi/ss/util/TestExpandedDouble.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java
index aba0d71a37..aba0d71a37 100644
--- a/src/testcases/org/apache/poi/ss/util/TestHSSFCellUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java b/main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
index 225d9f835c..225d9f835c 100644
--- a/src/testcases/org/apache/poi/ss/util/TestNumberComparer.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java b/main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
index 387980d870..387980d870 100644
--- a/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java b/main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java
index bd57735706..bd57735706 100644
--- a/src/testcases/org/apache/poi/ss/util/TestPropertyTemplate.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java
index 1fcd52ca80..1fcd52ca80 100644
--- a/src/testcases/org/apache/poi/ss/util/TestRegionUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java b/main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
index e258895c8f..e258895c8f 100644
--- a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java
index 1731d46371..1731d46371 100644
--- a/src/testcases/org/apache/poi/ss/util/TestSheetUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java b/main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
index bb4094a470..bb4094a470 100644
--- a/src/testcases/org/apache/poi/ss/util/TestWorkbookUtil.java
+++ b/main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
diff --git a/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java b/main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
index 3515f783bd..3515f783bd 100644
--- a/src/testcases/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
+++ b/main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
diff --git a/src/testcases/org/apache/poi/util/MemoryLeakVerifier.java b/main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java
index da84469c3f..da84469c3f 100644
--- a/src/testcases/org/apache/poi/util/MemoryLeakVerifier.java
+++ b/main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java
diff --git a/src/testcases/org/apache/poi/util/NullOutputStream.java b/main/src/test/java/org/apache/poi/util/NullOutputStream.java
index ac76123a3c..ac76123a3c 100644
--- a/src/testcases/org/apache/poi/util/NullOutputStream.java
+++ b/main/src/test/java/org/apache/poi/util/NullOutputStream.java
diff --git a/src/testcases/org/apache/poi/util/NullPrintStream.java b/main/src/test/java/org/apache/poi/util/NullPrintStream.java
index 5fd6bc64ad..5fd6bc64ad 100644
--- a/src/testcases/org/apache/poi/util/NullPrintStream.java
+++ b/main/src/test/java/org/apache/poi/util/NullPrintStream.java
diff --git a/src/testcases/org/apache/poi/util/TestArrayUtil.java b/main/src/test/java/org/apache/poi/util/TestArrayUtil.java
index 0038aa019d..0038aa019d 100644
--- a/src/testcases/org/apache/poi/util/TestArrayUtil.java
+++ b/main/src/test/java/org/apache/poi/util/TestArrayUtil.java
diff --git a/src/testcases/org/apache/poi/util/TestBitField.java b/main/src/test/java/org/apache/poi/util/TestBitField.java
index 55c30087fa..55c30087fa 100644
--- a/src/testcases/org/apache/poi/util/TestBitField.java
+++ b/main/src/test/java/org/apache/poi/util/TestBitField.java
diff --git a/src/testcases/org/apache/poi/util/TestByteField.java b/main/src/test/java/org/apache/poi/util/TestByteField.java
index 8c37667fbc..8c37667fbc 100644
--- a/src/testcases/org/apache/poi/util/TestByteField.java
+++ b/main/src/test/java/org/apache/poi/util/TestByteField.java
diff --git a/src/testcases/org/apache/poi/util/TestHexDump.java b/main/src/test/java/org/apache/poi/util/TestHexDump.java
index 4a465cb4be..4a465cb4be 100644
--- a/src/testcases/org/apache/poi/util/TestHexDump.java
+++ b/main/src/test/java/org/apache/poi/util/TestHexDump.java
diff --git a/src/testcases/org/apache/poi/util/TestIOUtils.java b/main/src/test/java/org/apache/poi/util/TestIOUtils.java
index 19b64dd3c1..19b64dd3c1 100644
--- a/src/testcases/org/apache/poi/util/TestIOUtils.java
+++ b/main/src/test/java/org/apache/poi/util/TestIOUtils.java
diff --git a/src/testcases/org/apache/poi/util/TestIntList.java b/main/src/test/java/org/apache/poi/util/TestIntList.java
index 3483933ce4..3483933ce4 100644
--- a/src/testcases/org/apache/poi/util/TestIntList.java
+++ b/main/src/test/java/org/apache/poi/util/TestIntList.java
diff --git a/src/testcases/org/apache/poi/util/TestIntegerField.java b/main/src/test/java/org/apache/poi/util/TestIntegerField.java
index d8e2f1b66f..d8e2f1b66f 100644
--- a/src/testcases/org/apache/poi/util/TestIntegerField.java
+++ b/main/src/test/java/org/apache/poi/util/TestIntegerField.java
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndian.java b/main/src/test/java/org/apache/poi/util/TestLittleEndian.java
index 27e5e3fe1a..27e5e3fe1a 100644
--- a/src/testcases/org/apache/poi/util/TestLittleEndian.java
+++ b/main/src/test/java/org/apache/poi/util/TestLittleEndian.java
diff --git a/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java b/main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
index 54ebefa5b5..54ebefa5b5 100644
--- a/src/testcases/org/apache/poi/util/TestLittleEndianStreams.java
+++ b/main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
diff --git a/src/testcases/org/apache/poi/util/TestLocaleUtil.java b/main/src/test/java/org/apache/poi/util/TestLocaleUtil.java
index 3335b85368..3335b85368 100644
--- a/src/testcases/org/apache/poi/util/TestLocaleUtil.java
+++ b/main/src/test/java/org/apache/poi/util/TestLocaleUtil.java
diff --git a/src/testcases/org/apache/poi/util/TestLongField.java b/main/src/test/java/org/apache/poi/util/TestLongField.java
index 8cd39aba92..8cd39aba92 100644
--- a/src/testcases/org/apache/poi/util/TestLongField.java
+++ b/main/src/test/java/org/apache/poi/util/TestLongField.java
diff --git a/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java b/main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
index 219e1460b1..219e1460b1 100644
--- a/src/testcases/org/apache/poi/util/TestRLEDecompressingInputStream.java
+++ b/main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
diff --git a/src/testcases/org/apache/poi/util/TestShortField.java b/main/src/test/java/org/apache/poi/util/TestShortField.java
index 8c863ee074..8c863ee074 100644
--- a/src/testcases/org/apache/poi/util/TestShortField.java
+++ b/main/src/test/java/org/apache/poi/util/TestShortField.java
diff --git a/src/testcases/org/apache/poi/util/TestStringCodepointsIterable.java b/main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java
index 4630a3cd0d..4630a3cd0d 100644
--- a/src/testcases/org/apache/poi/util/TestStringCodepointsIterable.java
+++ b/main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java
diff --git a/src/testcases/org/apache/poi/util/TestStringUtil.java b/main/src/test/java/org/apache/poi/util/TestStringUtil.java
index c0545cd762..c0545cd762 100644
--- a/src/testcases/org/apache/poi/util/TestStringUtil.java
+++ b/main/src/test/java/org/apache/poi/util/TestStringUtil.java
diff --git a/src/testcases/org/apache/poi/util/TestTempFile.java b/main/src/test/java/org/apache/poi/util/TestTempFile.java
index ec195e35f8..ec195e35f8 100644
--- a/src/testcases/org/apache/poi/util/TestTempFile.java
+++ b/main/src/test/java/org/apache/poi/util/TestTempFile.java
diff --git a/src/testcases/org/apache/poi/util/TestXMLHelper.java b/main/src/test/java/org/apache/poi/util/TestXMLHelper.java
index a4e8732b8d..a4e8732b8d 100644
--- a/src/testcases/org/apache/poi/util/TestXMLHelper.java
+++ b/main/src/test/java/org/apache/poi/util/TestXMLHelper.java
diff --git a/src/testcases/org/apache/poi/util/data/test_properties1 b/main/src/test/java/org/apache/poi/util/data/test_properties1
index 5c88809b70..5c88809b70 100644
--- a/src/testcases/org/apache/poi/util/data/test_properties1
+++ b/main/src/test/java/org/apache/poi/util/data/test_properties1
diff --git a/src/testcases/org/apache/poi/util/data/test_properties2 b/main/src/test/java/org/apache/poi/util/data/test_properties2
index dbf3f81e16..dbf3f81e16 100644
--- a/src/testcases/org/apache/poi/util/data/test_properties2
+++ b/main/src/test/java/org/apache/poi/util/data/test_properties2
diff --git a/src/testcases/org/apache/poi/util/data/test_properties3 b/main/src/test/java/org/apache/poi/util/data/test_properties3
index 84ba40da05..84ba40da05 100644
--- a/src/testcases/org/apache/poi/util/data/test_properties3
+++ b/main/src/test/java/org/apache/poi/util/data/test_properties3
diff --git a/src/multimodule/poi/test9/module-info.class b/main/src/test/java9/module-info.class
index 31c243495d..31c243495d 100644
--- a/src/multimodule/poi/test9/module-info.class
+++ b/main/src/test/java9/module-info.class
diff --git a/src/multimodule/poi/test9/module-info.java b/main/src/test/java9/module-info.java
index 58ac2220c5..58ac2220c5 100644
--- a/src/multimodule/poi/test9/module-info.java
+++ b/main/src/test/java9/module-info.java
diff --git a/src/resources/test/log4j2-test.xml b/main/src/test/resources/log4j2-test.xml
index 4737e9569a..4737e9569a 100644
--- a/src/resources/test/log4j2-test.xml
+++ b/main/src/test/resources/log4j2-test.xml
diff --git a/ooxml-schema/build.gradle b/ooxml-schema/build.gradle
new file mode 100644
index 0000000000..68aa790fcf
--- /dev/null
+++ b/ooxml-schema/build.gradle
@@ -0,0 +1,70 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+apply plugin: 'java'
+
+configurations {
+    antdep
+}
+
+dependencies {
+    antdep 'org.apache.ant:ant:1.10.9'
+}
+
+/*task downloadJarsToLibs() {
+    def f = new File("$projectDir/../lib/ooxml/xmlbeans-5.0.0.jar")
+    if (!f.exists()) {
+	println 'writing file ' + f.getAbsolutePath()
+	f.getParentFile().mkdirs()
+	new URL('https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar').withInputStream{ i -> f.withOutputStream{ it << i }}
+    }
+}*/
+
+// we need to ensure that the custom ant tasks are compiled before we import the build.xml file
+
+task compileContrib (type: JavaCompile) {
+    source = "../excelant/src/poi-ant-contrib/java"
+    include '*.java'
+    exclude 'Junit5Progress.java'
+    classpath = configurations.antdep
+    destinationDirectory = file('../excelant/build/poi-ant-contrib')
+}
+
+
+// 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 'compileContrib'
+compileJava.dependsOn 'ant-compile-ooxml-xsds'
+
+//compileJava.dependsOn 'downloadJarsToLibs'
+
+dependencies {
+    api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas'
+    }
+}
+
+japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
index 7423c85de0..7423c85de0 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
index 73a27fa50a..73a27fa50a 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd
index 5b08560c3a..5b08560c3a 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
index c9474a0f3a..c9474a0f3a 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd
index 79ae888a0e..79ae888a0e 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
index 3a2bb2c8e9..3a2bb2c8e9 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
diff --git a/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd
index f7019f13f5..f7019f13f5 100644
--- a/src/ooxml/resources/org/apache/poi/poifs/crypt/signatureInfo.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd
diff --git a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
index c416a662fa..c416a662fa 100755
--- a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
diff --git a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
index d6dcf4fbb9..d6dcf4fbb9 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
diff --git a/src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
index 5c4f52cea7..5c4f52cea7 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
diff --git a/src/ooxml/resources/org/apache/poi/schemas/XAdES.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd
index 4b74692f85..4b74692f85 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/XAdES.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd
diff --git a/src/ooxml/resources/org/apache/poi/schemas/XAdESv141.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd
index 8cb527978b..8cb527978b 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/XAdESv141.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd
diff --git a/src/ooxml/resources/org/apache/poi/schemas/markup-compatibility.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd
index 6be17c06be..6be17c06be 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/markup-compatibility.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd
diff --git a/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
index a567df5816..a567df5816 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
diff --git a/src/ooxml/resources/org/apache/poi/schemas/vmlDrawing.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd
index ec37e6eaf6..ec37e6eaf6 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/vmlDrawing.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd
diff --git a/src/ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd
index df126b30e6..df126b30e6 100644
--- a/src/ooxml/resources/org/apache/poi/schemas/xmldsig-core-schema.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd
diff --git a/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd b/ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd
index eec0b68c09..eec0b68c09 100644
--- a/src/ooxml/resources/org/apache/poi/xdgf/visio.xsd
+++ b/ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd
diff --git a/src/multimodule/ooxml-full/java9/module-info.class b/ooxml-schema/src/ooxml-full/java9/module-info.class
index 4c1707b28d..4c1707b28d 100644
--- a/src/multimodule/ooxml-full/java9/module-info.class
+++ b/ooxml-schema/src/ooxml-full/java9/module-info.class
diff --git a/src/multimodule/ooxml-full/java9/module-info.java b/ooxml-schema/src/ooxml-full/java9/module-info.java
index 4600c9082a..4600c9082a 100644
--- a/src/multimodule/ooxml-full/java9/module-info.java
+++ b/ooxml-schema/src/ooxml-full/java9/module-info.java
diff --git a/ooxml-schema/src/ooxml-lite/java9/module-info.class b/ooxml-schema/src/ooxml-lite/java9/module-info.class
new file mode 100644
index 0000000000..5a1a8d9258
--- /dev/null
+++ b/ooxml-schema/src/ooxml-lite/java9/module-info.class
diff --git a/src/multimodule/ooxml-lite/java9/module-info.java b/ooxml-schema/src/ooxml-lite/java9/module-info.java
index f8e193e41e..2559d369d8 100644
--- a/src/multimodule/ooxml-lite/java9/module-info.java
+++ b/ooxml-schema/src/ooxml-lite/java9/module-info.java
@@ -29,7 +29,6 @@ open module org.apache.poi.ooxml.schemas {
     exports com.microsoft.schemas.office.excel;
     exports com.microsoft.schemas.office.office;
     exports com.microsoft.schemas.office.visio.x2012.main;
-    exports com.microsoft.schemas.office.word;
     exports com.microsoft.schemas.office.x2006.digsig;
     exports com.microsoft.schemas.vml;
     exports org.apache.poi.schemas.ooxml.system.ooxml;
diff --git a/ooxml/build.gradle b/ooxml/build.gradle
new file mode 100644
index 0000000000..58ff2a4d1e
--- /dev/null
+++ b/ooxml/build.gradle
@@ -0,0 +1,58 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+dependencies {
+    api project(":ooxml-schema")
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    api "org.apache.commons:commons-compress:${commonsCompressVersion}"
+    api 'org.apache.santuario:xmlsec:2.2.1'
+    api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
+    api 'com.github.virtuald:curvesapi:1.06'
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+
+    api "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
+    implementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") {
+        exclude group: 'org.apache.xmlgraphics', module: 'batik-script'
+    }
+    implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}"
+
+    api 'de.rototor.pdfbox:graphics2d:0.30'
+
+    api project(':main')
+    api files("../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
+
+    testRuntime project(':scratchpad')
+    testImplementation 'org.xmlunit:xmlunit-core:2.8.0'
+    testImplementation 'org.reflections:reflections:0.9.12'
+    testImplementation project(path: ':main', configuration: 'tests')
+    testImplementation 'org.openjdk.jmh:jmh-core:1.26'
+    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
+    testImplementation 'com.google.guava:guava:30.0-jre'
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml'
+    }
+}
+
+japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
+
+test {
+    // for some reason catching the OOM does not work when run from Gradle
+    exclude '**/MemoryUsage.class'
+}
\ No newline at end of file
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java
index 216ff803e6..216ff803e6 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocument.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
index 4696e71de9..4696e71de9 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLException.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java
index d002fa0e84..d002fa0e84 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLException.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLFactory.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java
index 0e91da3be9..0e91da3be9 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLProperties.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java
index ca28affdbf..ca28affdbf 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLRelation.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
index 5bf576d4e0..5bf576d4e0 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/POIXMLTypeLoader.java b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
index 4a7a2b1b7b..4a7a2b1b7b 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLLister.java b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java
index b585be4b00..b585be4b00 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLLister.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
index fd48c05462..fd48c05462 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
index e56e91957d..e56e91957d 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
index 8cad08609d..8cad08609d 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
index 6df03370e2..6df03370e2 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
index eb235fa6aa..eb235fa6aa 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java
index f5a2b13996..f5a2b13996 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/DocumentHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/IdentifierManager.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java
index 8634862bb7..8634862bb7 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/IdentifierManager.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/POIXMLUnits.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java
index d6e020bcc0..d6e020bcc0 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/POIXMLUnits.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/PackageHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
index d357ab1f7f..d357ab1f7f 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/PackageHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java
index 1d6b7e515d..1d6b7e515d 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/SAXHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java
index c3f00bd034..c3f00bd034 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/TransformerHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java
diff --git a/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java b/ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java
index 6677f01fb9..6677f01fb9 100644
--- a/src/ooxml/java/org/apache/poi/ooxml/util/XPathHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
index 0cf0cfbc19..0cf0cfbc19 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
index 7a8338ed81..7a8338ed81 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
index bd6c6378ba..bd6c6378ba 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
index 61d8c8cd95..61d8c8cd95 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
index 2f82d1100a..2f82d1100a 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
index 4c7430df5b..4c7430df5b 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
index 40086aa9fc..40086aa9fc 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
index e469ace568..e469ace568 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
index cd7b456941..cd7b456941 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
index 14c0f1b985..14c0f1b985 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
index 6e11336bf5..6e11336bf5 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java
index 2568822285..2568822285 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageAccess.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
index d1adc519fc..d1adc519fc 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
index 81519ff2a5..81519ff2a5 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
index a9d7b4589c..a9d7b4589c 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
index d2d38b06d5..d2d38b06d5 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java
index 6d832090cd..6d832090cd 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
index bec1d00025..bec1d00025 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
index 07f8b98a3c..07f8b98a3c 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
index c328849e08..c328849e08 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
index bd1bce1b7e..bd1bce1b7e 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
index 87c424df54..87c424df54 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java
index af31eb3ab3..af31eb3ab3 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/StreamHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java
index 59f45f5386..59f45f5386 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/TargetMode.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
index 67e7c44567..67e7c44567 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
index 3e1e977f2b..3e1e977f2b 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
index 2e186be949..2e186be949 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
index 5b356843c8..5b356843c8 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
index 44e3766eb1..44e3766eb1 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
index f2d8c31151..f2d8c31151 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
index cf809d6678..cf809d6678 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
index 34e66326b5..34e66326b5 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
index e30d71783a..e30d71783a 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
index b3f74323f3..b3f74323f3 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
index 597335efc4..597335efc4 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
index 8208c545ad..8208c545ad 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
index 970768cb30..970768cb30 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
index 459cbef831..459cbef831 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
index f24a74015c..f24a74015c 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
index 384ad7687e..384ad7687e 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
index 278bffd9a1..278bffd9a1 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
index d19133f2cb..d19133f2cb 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
index 0709fd9021..0709fd9021 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
index 5bcfd8f1c0..5bcfd8f1c0 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
index 00961dffd4..00961dffd4 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
index 0dafb13443..0dafb13443 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
index 57103d2906..57103d2906 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
index 290b5fbd8c..290b5fbd8c 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
+++ b/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
index ba1909a62f..ba1909a62f 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
index f8ad4a33e5..f8ad4a33e5 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
index e7a4eba080..e7a4eba080 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
index d38088c68c..d38088c68c 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
index 98cb1933a3..98cb1933a3 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 8f43ef150a..8f43ef150a 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
index 06067ea531..06067ea531 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
index 2c7ccdabe9..2c7ccdabe9 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
index 43fd335836..43fd335836 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
index 0ba11fbd34..0ba11fbd34 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
index 1fd4151eb7..1fd4151eb7 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
index 6baebff972..6baebff972 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
index d59f4c9acb..d59f4c9acb 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
index 6f5061aac9..6f5061aac9 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
index f9ea3a9662..f9ea3a9662 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
index cc1a803ce6..cc1a803ce6 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
index e60771f563..e60771f563 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
index d18af54e46..d18af54e46 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
index 18f28f4837..18f28f4837 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
index d8fc9d4ceb..d8fc9d4ceb 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
index aa40675322..aa40675322 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
index ed5ce29918..ed5ce29918 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
index 56fd9ba232..56fd9ba232 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
index 945cf9f709..945cf9f709 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
index 72561af9bd..72561af9bd 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
index 0ea5bbdc1d..0ea5bbdc1d 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
index 2fb1749d4b..2fb1749d4b 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
index e1ea120e09..e1ea120e09 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
index 4ca8b864ee..4ca8b864ee 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
index ea6a0519aa..ea6a0519aa 100644
--- a/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
+++ b/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/Angles.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java
index 9f08483b60..9f08483b60 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/Angles.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
index 9767064fe4..9767064fe4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/CompoundLine.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java
index b241e44a6a..b241e44a6a 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/CompoundLine.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
index 8a664b6054..8a664b6054 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineCap.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java
index f8885bc81c..f8885bc81c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineCap.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndLength.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java
index aed43f85f3..aed43f85f3 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndLength.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java
index e3e03580ea..e3e03580ea 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndWidth.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
index 096d358c4b..096d358c4b 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PathShadeType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java
index 4ab3cf1f04..4ab3cf1f04 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PathShadeType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PenAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java
index 1414564ed0..1414564ed0 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PenAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java
index 1adccfedfb..1adccfedfb 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetGeometry.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
index 8e0e466288..8e0e466288 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetLineDash.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
index 5febf1aa9f..5febf1aa9f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetPattern.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java
index fe54fa5f17..fe54fa5f17 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/PresetPattern.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
index 9020a448d6..9020a448d6 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/SchemeColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java
index ce574c74a8..ce574c74a8 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/SchemeColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/SystemColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java
index ecb075d9de..ecb075d9de 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/SystemColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/TileFlipMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
index f540459856..f540459856 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
index c9ebc717f0..c9ebc717f0 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
index 608af4ba0e..608af4ba0e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColor.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java
index 4c71b77cdc..4c71b77cdc 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
index 3eea2d6279..3eea2d6279 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
index 5ec7d07e1e..5ec7d07e1e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
index 01cb6f2c07..01cb6f2c07 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
index 4e0563e1a8..4e0563e1a8 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
index 46c379c445..46c379c445 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
index 202e7db076..202e7db076 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
index 0f7a4a29fd..0f7a4a29fd 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
index 8da645b5fc..8da645b5fc 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
index d79c245dbe..d79c245dbe 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
index 97e09b963c..97e09b963c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
index 884dc91c25..884dc91c25 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
index c74ab07b30..c74ab07b30 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
index f880e276fc..f880e276fc 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
index 04cc94c8f7..04cc94c8f7 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
index e696314c67..e696314c67 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
index ab05448eec..ab05448eec 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
index ba7c088ed4..ba7c088ed4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
index 52edb95c84..52edb95c84 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
index deedaf4929..deedaf4929 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
index a6c9a9e097..a6c9a9e097 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
index 3317e1c6a1..3317e1c6a1 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
index e1b53ca21f..e1b53ca21f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
index 6de28cf361..6de28cf361 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
index f1aaea4ce7..f1aaea4ce7 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
index 0c3e54a245..0c3e54a245 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
index a379399b55..a379399b55 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPath.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java
index 67c760e87a..67c760e87a 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPath.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
index 8d5892fda6..8d5892fda6 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
index bf34c7a893..bf34c7a893 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPicture.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
index 873107a932..873107a932 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
index 2999d51e26..2999d51e26 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
index cdd4a03f85..cdd4a03f85 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
index a8989311b9..a8989311b9 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
index f60e314e86..f60e314e86 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
index 81a9942de2..81a9942de2 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
index 44d19bfd0a..44d19bfd0a 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
index 48f61cd643..48f61cd643 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
index eb0e80ce17..eb0e80ce17 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
index 9182f26ba8..9182f26ba8 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
index 1272cb50c4..1272cb50c4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
index 0630200942..0630200942 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
index 59542330d1..59542330d1 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
index 258f47a35d..258f47a35d 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
index cd509cb9ce..cd509cb9ce 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
index 772a671ebc..772a671ebc 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
index 7be31ce03c..7be31ce03c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
index cb83f084a4..cb83f084a4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
index c601836e3e..c601836e3e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
index 2d5823d000..2d5823d000 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
index 457cc34f96..457cc34f96 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
index c3d0747617..c3d0747617 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
index bb606fde33..bb606fde33 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
index 7f822abbb8..7f822abbb8 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
index 043bf21b11..043bf21b11 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
index f90e43185d..f90e43185d 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
index bd06b4bfdb..bd06b4bfdb 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
index f46bdb363b..f46bdb363b 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Grouping.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
index 516477343e..516477343e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
index 425dd2202e..425dd2202e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
index 1ed359f6df..1ed359f6df 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
index 88f67cd001..88f67cd001 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
index 3d6724720f..3d6724720f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
index 6b8d9854b6..6b8d9854b6 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
index 29b986cfd8..29b986cfd8 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Shape.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java
index ad9ea25931..ad9ea25931 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/Shape.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
index ebc0ee6305..ebc0ee6305 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
index e09121225c..e09121225c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
index 3f6984f6e4..3f6984f6e4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
index 9ff0bc0d94..9ff0bc0d94 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
index bbdccedb13..bbdccedb13 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
index 6bdc8cf911..6bdc8cf911 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
index 7b29b33a28..7b29b33a28 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
index c04e066ed2..c04e066ed2 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
index 365d3f37fd..365d3f37fd 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
index 9e593edfbb..9e593edfbb 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
index d7a77f568b..d7a77f568b 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
index 01c8660090..01c8660090 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
index ea99a34b12..ea99a34b12 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
index 4cd3bc876f..4cd3bc876f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
index 00722ea02a..00722ea02a 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
index 23020f842a..23020f842a 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
index 108793d0ce..108793d0ce 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
index 257931a5d4..257931a5d4 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
index 526c1ebf19..526c1ebf19 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
index 2f2e6fa738..2f2e6fa738 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
index 34bad10619..34bad10619 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
index 856a530fbc..856a530fbc 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
index 95ef676462..95ef676462 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
index d2a5059847..d2a5059847 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
index 6a3a28c576..6a3a28c576 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
index f7f2edac6d..f7f2edac6d 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
index bb500cd20f..bb500cd20f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
index df0297e288..df0297e288 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
index 982a104632..982a104632 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
index 25e8fad31c..25e8fad31c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
index fedd3f3d50..fedd3f3d50 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
index 9189a65f74..9189a65f74 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
index 4bfe1e10b6..4bfe1e10b6 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AnchorType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
index 43575a6c4f..43575a6c4f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
index 71eb95aac5..71eb95aac5 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/CapsType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java
index b6dc261095..b6dc261095 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/CapsType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
index 79327f769e..79327f769e 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/StrikeType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
index 68544ec032..68544ec032 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
index d3a8e768f9..d3a8e768f9 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
index 67f0a88e3d..67f0a88e3d 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextContainer.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
index a8c89d02f5..a8c89d02f5 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
index 453ce20d35..453ce20d35 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
index e9be9708b3..e9be9708b3 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
index 80d6f019bf..80d6f019bf 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
index c1a4cb9e13..c1a4cb9e13 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
index 098de23617..098de23617 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
index b1eefa90f7..b1eefa90f7 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
index 0845087b7c..0845087b7c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
index 0358881371..0358881371 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
index c5996057a0..c5996057a0 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
index 6f133715c5..6f133715c5 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
index 9c6da47d9c..9c6da47d9c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
index 173a4e0539..173a4e0539 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
index e0f0b42528..e0f0b42528 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
index 46d4dcdcec..46d4dcdcec 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
index 16070a471b..16070a471b 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
index ada34afe94..ada34afe94 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
index 3e3249d3bd..3e3249d3bd 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
index 456e1d54d9..456e1d54d9 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
index aae476e125..aae476e125 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
index 0721313e6c..0721313e6c 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
index 39da4a4c36..39da4a4c36 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
index 70c099e725..70c099e725 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
index ea1a771f7f..ea1a771f7f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
index a843002dd1..a843002dd1 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
index 2c97837ab2..2c97837ab2 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
index 7fa888b05f..7fa888b05f 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
index 0817f23592..0817f23592 100644
--- a/src/ooxml/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java b/ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java
index 7d1a19e553..7d1a19e553 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/exceptions/XDGFException.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java b/ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
index 7ffbf62b63..7ffbf62b63 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java
index a96071a3bb..a96071a3bb 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineCollector.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java
index dd4bfc20ed..dd4bfc20ed 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/geom/SplineRenderer.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
index 9559cce58b..9559cce58b 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
index e4bdfcd8a5..e4bdfcd8a5 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
index cc24a41fca..cc24a41fca 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
index 924dec552b..924dec552b 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
index 6cd39cb785..6cd39cb785 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
index b1edbcb277..b1edbcb277 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
index efe0512efa..efe0512efa 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
index da79bc4e1a..da79bc4e1a 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
index 54d44af122..54d44af122 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
index 658c2ca985..658c2ca985 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
index 1d27969fed..1d27969fed 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
index dbdf7aaa4d..dbdf7aaa4d 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
index 29b55ef7c2..29b55ef7c2 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
index 2f22ab805f..2f22ab805f 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
index ef363efc8e..ef363efc8e 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
index 50f61842b0..50f61842b0 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
index c823bb343d..c823bb343d 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XDGFText.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
index 40de1aaf72..40de1aaf72 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
index e98d08296f..e98d08296f 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
index 2d6f251bb4..2d6f251bb4 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
index b0ecf2051e..b0ecf2051e 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
index 7dd4641107..7dd4641107 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
index b9da05f1f5..b9da05f1f5 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
index c6340456a2..c6340456a2 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
index 35af8d52be..35af8d52be 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
index 4547229d4a..4547229d4a 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
index 8f509f9607..8f509f9607 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
index 2ec09f6b6b..2ec09f6b6b 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
index 8ffaef26f4..8ffaef26f4 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
index c7383f3cc2..c7383f3cc2 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
index 808080920b..808080920b 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
index c324d916a4..c324d916a4 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
index 1b9f0f9556..1b9f0f9556 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
index b64518138b..b64518138b 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
index 847dce06b7..847dce06b7 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
index 9e11bb31a6..9e11bb31a6 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
index e6a9731b66..e6a9731b66 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
index b7e56bf9bd..b7e56bf9bd 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
index e6037279ea..e6037279ea 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
index bd006ac60e..bd006ac60e 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
index c6e0332d6c..c6e0332d6c 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
index 57c9cdec93..57c9cdec93 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
index 062f987ab3..062f987ab3 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
index a6a76642d9..a6a76642d9 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
index 9a0f28cf54..9a0f28cf54 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
index 2e4d89647d..2e4d89647d 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
index e50ce11eab..e50ce11eab 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
index 2a33c43407..2a33c43407 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
index eb9e4a6203..eb9e4a6203 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
index eb37159ba4..eb37159ba4 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/Util.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java
index 80ab4a2cc6..80ab4a2cc6 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/util/Util.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java b/ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java
index e8c96c3355..e8c96c3355 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/util/VsdxToPng.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java
diff --git a/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java b/ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
index 51409a40de..51409a40de 100644
--- a/src/ooxml/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
+++ b/ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGImageRenderer.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
index ac357759fc..ac357759fc 100644
--- a/src/ooxml/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
index b2b40f9163..b2b40f9163 100644
--- a/src/ooxml/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/draw/SVGRenderExtension.java b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
index 35536714ed..35536714ed 100644
--- a/src/ooxml/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFExtractor.java b/ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
index fbdeede6a3..fbdeede6a3 100644
--- a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
index beb8c5a431..beb8c5a431 100644
--- a/src/ooxml/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
index 7cce4c64a7..7cce4c64a7 100644
--- a/src/ooxml/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java
index eb157e82e3..eb157e82e3 100644
--- a/src/ooxml/java/org/apache/poi/xslf/model/PropertyFetcher.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
index 2c0cfef0b8..2c0cfef0b8 100644
--- a/src/ooxml/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
index 729057b13b..729057b13b 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/SlideLayout.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index 1f81dc34ee..1f81dc34ee 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
index a69af0e0e7..a69af0e0e7 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
index add51e6566..add51e6566 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java
index c54cba50c8..c54cba50c8 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFChart.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
index c939383488..c939383488 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComment.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java
index ab925b2f0c..ab925b2f0c 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComment.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
index 01b98099d1..01b98099d1 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
index 00fa47d5f1..00fa47d5f1 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
index cd15e7d852..cd15e7d852 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
index dca6fed131..dca6fed131 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
index e6b27e62ea..e6b27e62ea 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
index 8b2cb09ebc..8b2cb09ebc 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
index 1e7462113e..1e7462113e 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
index 593a4ee1ca..593a4ee1ca 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
index 3938295e11..3938295e11 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
index 59109b7e32..59109b7e32 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
index 5cf47873f3..5cf47873f3 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
index e4c417c464..e4c417c464 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
index 9c279b6aa7..9c279b6aa7 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
index 3d06e46c4e..3d06e46c4e 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
index 19b42c119f..19b42c119f 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
index 6ebe185531..6ebe185531 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
index 09125fe585..09125fe585 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
index 8ee5017d1f..8ee5017d1f 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
index 11f94477f3..11f94477f3 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
index 9c4fc5902e..9c4fc5902e 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
index ce75a19f61..ce75a19f61 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
index bc1aee7850..bc1aee7850 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
index 5139e6278c..5139e6278c 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
index 9ec4e3e6bc..9ec4e3e6bc 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
index 5a267595e2..5a267595e2 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
index ddf832d3d9..ddf832d3d9 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
index 1364cd7228..1364cd7228 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
index f7424d1807..f7424d1807 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
index c126afdd7a..c126afdd7a 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
index 17f66bec0a..17f66bec0a 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
index 7a20d04d1d..7a20d04d1d 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
index 4b30679d41..4b30679d41 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
index 929b000bbb..929b000bbb 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
index 3d699af3ab..3d699af3ab 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index e640ba82ae..e640ba82ae 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
index d30bfa5521..d30bfa5521 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
index db67222c21..db67222c21 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
index 6d4372c21a..6d4372c21a 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
index e2100e81fd..e2100e81fd 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
index e3e30d18c6..e3e30d18c6 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
index a30571f16e..a30571f16e 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
index ea1c179d66..ea1c179d66 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
index a147758403..a147758403 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
index 655be92305..655be92305 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
index 8744b80690..8744b80690 100644
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/BitmapFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java
index a33a85344b..a33a85344b 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/BitmapFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/DummyFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
index f3dfe26d72..f3dfe26d72 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/DummyFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java
index db6e09abfb..db6e09abfb 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/DummyGraphics2d.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/EMFHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java
index 761c819612..761c819612 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/EMFHandler.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/MFProxy.java b/ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java
index 5a02c63695..5a02c63695 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/MFProxy.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/OutputFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java
index cfa8df2c83..cfa8df2c83 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/OutputFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PDFFontMapper.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java
index 73c48ed049..73c48ed049 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PDFFontMapper.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PDFFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
index 1b71fb3f7b..1b71fb3f7b 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PDFFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
index 79d676ddc0..79d676ddc0 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTHandler.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 27f053dc85..27f053dc85 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/SVGFormat.java b/ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java
index 1725aa4f10..1725aa4f10 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/SVGFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xslf/util/WMFHandler.java b/ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java
index b97a9e8931..b97a9e8931 100644
--- a/src/ooxml/java/org/apache/poi/xslf/util/WMFHandler.java
+++ b/ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java b/ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java
index 6834d81001..6834d81001 100644
--- a/src/ooxml/java/org/apache/poi/xssf/XLSBUnsupportedException.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
index 6e3d0c0c9f..6e3d0c0c9f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
index d090002a28..d090002a28 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBComment.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java
index ed3b918f33..ed3b918f33 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBComment.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
index 057f61ee20..057f61ee20 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
index 674ed4410b..674ed4410b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
index a0e01832de..a0e01832de 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
index ca76fb0332..ca76fb0332 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParseException.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java
index 7098bbe26e..7098bbe26e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParseException.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParser.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
index 398d53bc92..398d53bc92 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBParser.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
index e54f5a5a72..e54f5a5a72 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRelation.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java
index 94599bc5aa..94599bc5aa 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichStr.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
index 7e18a1a4dc..7e18a1a4dc 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
index 990dd41de2..990dd41de2 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
index 791a77c828..791a77c828 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
index b726545daf..b726545daf 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
index 34ad623c3c..34ad623c3c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBUtils.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java
index 6f1dd70bd3..6f1dd70bd3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBUtils.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
index 080048af45..080048af45 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/package-info.java b/ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java
index 7efaeaae7b..7efaeaae7b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/binary/package-info.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
index bcc30c3f59..bcc30c3f59 100644
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
index 6d4c2eb0b3..6d4c2eb0b3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
index d31c489e81..d31c489e81 100644
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
index 1cbb4d4fc3..1cbb4d4fc3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
index 817ed64a1e..817ed64a1e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
index 35fcb58685..35fcb58685 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
index 43c9dcf101..43c9dcf101 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
index d918ae1a65..d918ae1a65 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
index 4605ee04e0..4605ee04e0 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java b/ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
index 58933cdd1e..58933cdd1e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Comments.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
index 1341de6561..1341de6561 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/Comments.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
index c31de3e345..c31de3e345 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
index b267123e48..b267123e48 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/ExternalLinksTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java b/ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
index 10f81c8632..10f81c8632 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
index 00f40f790c..00f40f790c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStrings.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java
index 82f5bfb371..82f5bfb371 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/SharedStrings.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java
index f1d59a14bb..f1d59a14bb 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java b/ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
index 1ea7eb2824..1ea7eb2824 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Styles.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java
index 135581c7d0..135581c7d0 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/Styles.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
index a007608e26..a007608e26 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Themes.java b/ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java
index 7e0f427d7a..7e0f427d7a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/Themes.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java b/ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
index 0e68bceacf..0e68bceacf 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/ThemesTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
index 43bfdf9f83..43bfdf9f83 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
index edd1d04497..edd1d04497 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
index fb21c779c8..fb21c779c8 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
index ce2da084e9..ce2da084e9 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcOutputStream.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
index b8253c054d..b8253c054d 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
index 573d580e37..573d580e37 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
index b3d9511372..b3d9511372 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
index 4eb67ea8a5..4eb67ea8a5 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
index d18177c032..d18177c032 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
index dbaf370e30..dbaf370e30 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
index aaafa87609..aaafa87609 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
index f47b051d24..f47b051d24 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
index 7039c1b35f..7039c1b35f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
index 67fe562aac..67fe562aac 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
index a39eb590c8..a39eb590c8 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
index 8d6e903d9d..8d6e903d9d 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFRow.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index 04e0c0e735..04e0c0e735 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
index a4a9a439e5..a4a9a439e5 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
index f72b6a2ff3..f72b6a2ff3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
index ef5e6c3438..ef5e6c3438 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/streaming/Zip64Impl.java b/ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java
index 5dfc49008a..5dfc49008a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/streaming/Zip64Impl.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
index 79f003eb9c..79f003eb9c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
index bbad20e518..bbad20e518 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
index 05d442db75..05d442db75 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
index 0d2980b4b1..0d2980b4b1 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
index eac3a037ed..eac3a037ed 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
index 5108813b28..5108813b28 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java
index b93a885c20..b93a885c20 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAlign.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java
index 6e01b134fd..6e01b134fd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextAutofit.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java
index 9202e92b42..9202e92b42 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextCap.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java
index f91fcca7a8..f91fcca7a8 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextDirection.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
index 96417980c4..96417980c4 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
index b1fe0c18d3..b1fe0c18d3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
index 87d3e40189..87d3e40189 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
index de855787be..de855787be 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
index d363ab31ab..d363ab31ab 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
index 4afbcb123e..4afbcb123e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
index 2ba065b766..2ba065b766 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
index d2d135b3e2..d2d135b3e2 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index c7d1f85f32..c7d1f85f32 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java
index e5646a41d6..e5646a41d6 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChart.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
index 883e33a58e..883e33a58e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
index ff727adb2a..ff727adb2a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
index 428a06ddf1..428a06ddf1 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
index a8507cd92e..a8507cd92e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
index 31f5f28373..31f5f28373 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
index 441f242f4a..441f242f4a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFComment.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
index 59bfb94067..59bfb94067 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
index eff8e375b4..eff8e375b4 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
index 829acbbd30..829acbbd30 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
index f868f14a2b..f868f14a2b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
index 78d4e402e4..78d4e402e4 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
index fedbc8d3dd..fedbc8d3dd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
index fecd4f0221..fecd4f0221 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
index 8c867ab566..8c867ab566 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
index ca451a5d33..ca451a5d33 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
index b62a38e0a5..b62a38e0a5 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
index 9e62aa07e7..9e62aa07e7 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
index bb81b5ff50..bb81b5ff50 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
index c781ca7285..c781ca7285 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
index c68f16eb09..c68f16eb09 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
index 221154b331..221154b331 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
index 18b663c2b3..18b663c2b3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
index 2c13f82668..2c13f82668 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
index 8234793c3e..8234793c3e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
index dfd9d179b8..dfd9d179b8 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
index b931154d9a..b931154d9a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
index 4bccf9ef1e..4bccf9ef1e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
index 4cb2254d2f..4cb2254d2f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java
index b6d4465ecc..b6d4465ecc 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFont.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
index 6b359a2988..6b359a2988 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
index ccd1799955..ccd1799955 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
index 4a46f641a4..4a46f641a4 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
index af3f8c29fc..af3f8c29fc 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
index 1d13e688c5..1d13e688c5 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
index 29062ee06f..29062ee06f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
index 99596992b9..99596992b9 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java
index 17c12c195b..17c12c195b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
index 21300d47e3..21300d47e3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
index 16d04085f2..16d04085f2 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
index 1e2239d8d3..1e2239d8d3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
index 1cce6e59be..1cce6e59be 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
index 0f191c28f2..0f191c28f2 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
index 86f3bd917b..86f3bd917b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
index ecdb1de04c..ecdb1de04c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
index 2f5888976a..2f5888976a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
index 540494c35f..540494c35f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
index d45f6c6a18..d45f6c6a18 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
index 8ace06e95a..8ace06e95a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
index e626790d88..e626790d88 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
index 50248fae81..50248fae81 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
index ee502b1b39..ee502b1b39 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
index d71641b7de..d71641b7de 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
index 2e285dc747..2e285dc747 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java
index 8f7489434c..8f7489434c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
index 96c7c9bcd3..96c7c9bcd3 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 571d4fb766..571d4fb766 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
index 9967a2cf79..9967a2cf79 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
index 478bca9626..478bca9626 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
index dfc7a69466..dfc7a69466 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
index 62f6158deb..62f6158deb 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
index 7d1f4661cd..7d1f4661cd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
index 852f91c62d..852f91c62d 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
index fc515e6edb..fc515e6edb 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
index 74c26b9306..74c26b9306 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
index 0d33e0c4f6..0d33e0c4f6 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
index 1809e16cd5..1809e16cd5 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
index b5efa0951a..b5efa0951a 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
index 59aa229853..59aa229853 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index f64ed3c4cd..f64ed3c4cd 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
index 3ac689f372..3ac689f372 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
index 917d3d6daa..917d3d6daa 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
index 15837ca575..15837ca575 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
index 31ed2a2203..31ed2a2203 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
index dd9dca7d16..dd9dca7d16 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
index 2ab58f6fa0..2ab58f6fa0 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
index f65856ea69..f65856ea69 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
index e4731dae11..e4731dae11 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
index 2acc8955f1..2acc8955f1 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
index 926e2a2d87..926e2a2d87 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
index 2fd4218ca6..2fd4218ca6 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
index 167cee14ff..167cee14ff 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
index 298fa3f48f..298fa3f48f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
index ffbc570796..ffbc570796 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
index 79cc921a34..79cc921a34 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
index 08e9ca05c1..08e9ca05c1 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java b/ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
index ef8e526a43..ef8e526a43 100644
--- a/src/ooxml/java/org/apache/poi/xssf/util/CTColComparator.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
diff --git a/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java b/ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java
index 0a853cc7c8..0a853cc7c8 100644
--- a/src/ooxml/java/org/apache/poi/xssf/util/NumericRanges.java
+++ b/ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
index 578d6f2828..578d6f2828 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
index 6a29cd3898..6a29cd3898 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
index 3c956be237..3c956be237 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
index 46636c3ef2..46636c3ef2 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/package-info.java b/ooxml/src/main/java/org/apache/poi/xwpf/package-info.java
index 0d425b0979..0d425b0979 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/package-info.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/package-info.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
index d93ba9d0b6..d93ba9d0b6 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java
index ebf6a4d188..ebf6a4d188 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BodyType.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
index d77e7f088f..d77e7f088f 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Borders.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java
index 895c143b0c..895c143b0c 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakClear.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
index aea132db97..aea132db97 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/BreakType.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
index 0bd4175f9b..0bd4175f9b 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/Document.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
index 1f3d60d93a..1f3d60d93a 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java
index 3c8be00a0f..3c8be00a0f 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBody.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
index 2585459215..2585459215 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java
index c89f939600..c89f939600 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ICell.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java
index c221990409..c221990409 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunBody.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
index 9c87820fab..9c87820fab 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/IRunElement.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
index d0c185e888..d0c185e888 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
index 66922b8376..66922b8376 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
index 836069d0d5..836069d0d5 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
index e3599032f8..e3599032f8 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
index 4cd688c205..4cd688c205 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
index 74913cf815..74913cf815 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TOC.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
index 0345ecafa0..0345ecafa0 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
index 2a42c76baf..2a42c76baf 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableWidthType.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
index bb779dfb27..bb779dfb27 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
index 6ed8dc00e4..6ed8dc00e4 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java
index 1cae3467f5..1cae3467f5 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/TextSegment.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
index f863d79fbf..f863d79fbf 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
index 209e006dca..209e006dca 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
index ff509ecdc2..ff509ecdc2 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
index d626350298..d626350298 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
index ac95c29ab2..ac95c29ab2 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
index 434d857f2c..434d857f2c 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFChart.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
index 495cde1bf9..495cde1bf9 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
index f9ee63fc44..f9ee63fc44 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComments.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
index 3cf82b680c..3cf82b680c 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
index 77679d2db7..77679d2db7 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
index 24c235d0e0..24c235d0e0 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index fcf58ed692..fcf58ed692 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
index f18c1c118a..f18c1c118a 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
index 1df57f6d56..1df57f6d56 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
index fd5eca0014..fd5eca0014 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
index 1f1559b3a0..1f1559b3a0 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
index 07375a223b..07375a223b 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
index 77459ecc87..77459ecc87 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
index 8f7c591c5a..8f7c591c5a 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
index fe12c8df70..fe12c8df70 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
index 4f09eb64de..4f09eb64de 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
index c00f75a890..c00f75a890 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
index 7a5ad06b89..7a5ad06b89 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
index 3122840dd8..3122840dd8 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
index 9fa8ab38da..9fa8ab38da 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
index 581c0128a4..581c0128a4 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index bbf59867d1..bbf59867d1 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
index f46d2cd158..f46d2cd158 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
index 548c614661..548c614661 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
index d67a8303b9..d67a8303b9 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
index ee741bace4..ee741bace4 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
index 82aa024623..82aa024623 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
index 5589287263..5589287263 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
index eaaf94d873..eaaf94d873 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
index 8432b39d28..8432b39d28 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
index 8df9e3f806..8df9e3f806 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
index 95b88bac04..95b88bac04 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
index 05f59189a5..05f59189a5 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
index 93b05ab901..93b05ab901 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
index e95057f342..e95057f342 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
index 4c4cfd7820..4c4cfd7820 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
index c01643ec0d..c01643ec0d 100644
--- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
+++ b/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
diff --git a/src/multimodule/ooxml/java9/module-info.class b/ooxml/src/main/java9/module-info.class
index 9f991b0c36..9f991b0c36 100644
--- a/src/multimodule/ooxml/java9/module-info.class
+++ b/ooxml/src/main/java9/module-info.class
diff --git a/src/multimodule/ooxml/java9/module-info.java b/ooxml/src/main/java9/module-info.java
index 317a9d9ca9..317a9d9ca9 100644
--- a/src/multimodule/ooxml/java9/module-info.java
+++ b/ooxml/src/main/java9/module-info.java
diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index bb22aa1dbb..bb22aa1dbb 100644
--- a/src/resources/ooxml/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index f5f7bb9556..f5f7bb9556 100644
--- a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
index f4251abe27..f4251abe27 100644
--- a/src/resources/ooxml/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
+++ b/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
diff --git a/src/resources/ooxml/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
index 48b893240d..48b893240d 100644
--- a/src/resources/ooxml/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
+++ b/ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
diff --git a/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx
index ababa93791..ababa93791 100644
--- a/src/resources/ooxml/org/apache/poi/xslf/usermodel/empty.pptx
+++ b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx
diff --git a/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml
index 0a8db65bd8..0a8db65bd8 100644
--- a/src/resources/ooxml/org/apache/poi/xslf/usermodel/notesMaster.xml
+++ b/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml
diff --git a/src/resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml b/ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml
index f83f2e33c1..f83f2e33c1 100644
--- a/src/resources/ooxml/org/apache/poi/xssf/usermodel/presetTableStyles.xml
+++ b/ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml
diff --git a/src/multimodule/ooxml-lite-agent/java9/module-info.class b/ooxml/src/ooxml-lite-agent/java9/module-info.class
index 51e4e32994..51e4e32994 100644
--- a/src/multimodule/ooxml-lite-agent/java9/module-info.class
+++ b/ooxml/src/ooxml-lite-agent/java9/module-info.class
diff --git a/src/multimodule/ooxml-lite-agent/java9/module-info.java b/ooxml/src/ooxml-lite-agent/java9/module-info.java
index 85184ca2b2..85184ca2b2 100644
--- a/src/multimodule/ooxml-lite-agent/java9/module-info.java
+++ b/ooxml/src/ooxml-lite-agent/java9/module-info.java
diff --git a/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java b/ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java
index c1cf799c25..c1cf799c25 100644
--- a/src/ooxml/testcases/org/apache/poi/benchmark/AddImageBench.java
+++ b/ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java
diff --git a/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java b/ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
index b94a3454de..b94a3454de 100644
--- a/src/ooxml/testcases/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
index 13e46c5222..13e46c5222 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestDetectAsOOXML.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
index e41193a3c8..e41193a3c8 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestEmbedded.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
index 86179eeaae..86179eeaae 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
index 2104a418a8..2104a418a8 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLDocument.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLProperties.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
index 57306d1637..57306d1637 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestPOIXMLProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
index 7745125ea4..7745125ea4 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestTriggerCoverage.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java b/ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
index c077e15085..c077e15085 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java b/ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
index 64cec25ac6..64cec25ac6 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
+++ b/ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
index 1c6b942a58..1c6b942a58 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
index 7847507017..7847507017 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
index 7a5d012fed..7a5d012fed 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
index 481ce98620..481ce98620 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestListParts.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
index 9f297f66c6..9f297f66c6 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
index 317d1009a0..317d1009a0 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
index 2572aadfad..2572aadfad 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagePartName.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
index e68a92d200..e68a92d200 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
index 714d81180b..714d81180b 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
index d80c88ae12..d80c88ae12 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestRelationships.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
index fcc6e3cff8..fcc6e3cff8 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/ZipFileAssert.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
index 3ebd4041a3..3ebd4041a3 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
index e81605fc26..e81605fc26 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
index edfe0fea3e..edfe0fea3e 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
index aab917ec63..aab917ec63 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
index 3b9b03aed4..3b9b03aed4 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java b/ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java
index d80a44a1d8..d80a44a1d8 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/util/TestZipSecureFile.java
+++ b/ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
index 61eddc0d6e..61eddc0d6e 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
index d7fc0b4471..d7fc0b4471 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
index 14e6debbf4..14e6debbf4 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
index fed15e2f3c..fed15e2f3c 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
index 879bf2d2a6..879bf2d2a6 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
index ed2ee87e02..ed2ee87e02 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
index bf5aebb590..bf5aebb590 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
index 7dbbbe3d2a..7dbbbe3d2a 100644
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
+++ b/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/SLCommonUtils.java b/ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java
index 3c3d243db8..3c3d243db8 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/SLCommonUtils.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java
index bd5d190d69..bd5d190d69 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestFonts.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java
index bd0d0ccb85..bd0d0ccb85 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestHeadersFooters.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
index bda636d2ad..bda636d2ad 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestOleShape.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
index eb066e4688..eb066e4688 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestSlide.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java b/ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
index cedb11eed0..cedb11eed0 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/TestTable.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java b/ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
index 9f5568c4c4..9f5568c4c4 100644
--- a/src/ooxml/testcases/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
+++ b/ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java b/ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
index 200407e3ef..200407e3ef 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/TestWorkbookFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java b/ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
index ca3ec7d1fe..ca3ec7d1fe 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java b/ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java
index 8514542080..8514542080 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/format/TestCellFormatPart.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java
index 5d1c7d8e31..5d1c7d8e31 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestFormulaParser.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
index f169e7b69d..f169e7b69d 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
index 114f70a13e..114f70a13e 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestCountifs.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
index 902de11a80..902de11a80 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestProper.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
index c1a80cb5a4..c1a80cb5a4 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestProper.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
index 2beafffd13..2beafffd13 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
index 753e2046d2..753e2046d2 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
index f43609c392..f43609c392 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
index 744f342694..744f342694 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
index ae68cace8c..ae68cace8c 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
index 49ea01f697..49ea01f697 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
index 4e6257c650..4e6257c650 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
index 001ea8ebce..001ea8ebce 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
index d191c7ab7c..d191c7ab7c 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
index 3ee318abdf..3ee318abdf 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
index 0e2511f36d..0e2511f36d 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
index 40f16dbe61..40f16dbe61 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
diff --git a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
index c6f9f59cc0..c6f9f59cc0 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
+++ b/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java b/ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java
index 71fe575c67..71fe575c67 100644
--- a/src/ooxml/testcases/org/apache/poi/util/tests/TestIdentifierManager.java
+++ b/ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java
diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java b/ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java
index 678280e7b1..678280e7b1 100644
--- a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java
+++ b/ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
index bc235f51b5..bc235f51b5 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java
index 7eb01c29a7..7eb01c29a7 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/TestXDDFColor.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
index 45ff5d7747..45ff5d7747 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
index f4bd59ec9a..f4bd59ec9a 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
index ca5c40aaf1..ca5c40aaf1 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
index 0cbb10b0f2..0cbb10b0f2 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
index 1d98b42e44..1d98b42e44 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
index 90c7759e6b..90c7759e6b 100644
--- a/src/ooxml/testcases/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
+++ b/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
index adc76e554a..adc76e554a 100644
--- a/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java b/ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
index 5679c28cd9..5679c28cd9 100644
--- a/src/ooxml/testcases/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
+++ b/ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
index 307348f011..307348f011 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
index acbf365046..acbf365046 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
index 1d948dc6ee..1d948dc6ee 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
index 72ed16f94b..72ed16f94b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/XSLFTestDataSamples.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
index 5e5f0ed4cb..5e5f0ed4cb 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
index 4226b28095..4226b28095 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
index 520f62fb04..520f62fb04 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
index 330f6629e7..330f6629e7 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
index 907a37a80d..907a37a80d 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
index c9608359bb..c9608359bb 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
index a872ecca1b..a872ecca1b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
index d7afa7ef0b..d7afa7ef0b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
index 02640c0efe..02640c0efe 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
index 6f57d11790..6f57d11790 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
index 547da5f71c..547da5f71c 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
index 90fcf71568..90fcf71568 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
index 526abab2c9..526abab2c9 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
index 0df21b2720..0df21b2720 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
index 116eddac13..116eddac13 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
index 2f5b57161f..2f5b57161f 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
index cd467554e3..cd467554e3 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
index c25e822538..c25e822538 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
index 3b83355369..3b83355369 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
index 7e47a24b0a..7e47a24b0a 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
index 89436fcbf0..89436fcbf0 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
index c36035244c..c36035244c 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
index 4c1109e519..4c1109e519 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
index f1232de7cd..f1232de7cd 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
index 04fa9551d1..04fa9551d1 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
index 749a8faeca..749a8faeca 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
index 783e8abe4d..783e8abe4d 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
index 372e0216f4..372e0216f4 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
index 54f66f6b8b..54f66f6b8b 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
+++ b/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
index 56c5efda1f..56c5efda1f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
index 90de9c5977..90de9c5977 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/SXSSFITestDataProvider.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
index db2a96a844..db2a96a844 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java b/ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
index f3459af7dc..f3459af7dc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestSheetProtection.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java b/ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
index 11c4ff20d7..11c4ff20d7 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestWorkbookProtection.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java
index b3c2896fd8..b3c2896fd8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFCloneSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFMemoryLeak.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
index bb9859998c..bb9859998c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFMemoryLeak.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java
index b39c33bce0..b39c33bce0 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/TestXSSFOffset.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
index e0ba6617ca..e0ba6617ca 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
index b981b9994e..b981b9994e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
index 7a56829584..7a56829584 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
index 6fd654df31..6fd654df31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
index 3d59980c05..3d59980c05 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
index 2d6e57e049..2d6e57e049 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
index 766ebeb0ef..766ebeb0ef 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
index 377918ec1f..377918ec1f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
index 8cd773a2e9..8cd773a2e9 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
index 0de3611bc1..0de3611bc1 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
index 3dd4b83039..3dd4b83039 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
index 2068a4a993..2068a4a993 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
index 4ef8030119..4ef8030119 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
index 5a6afb7e20..5a6afb7e20 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
index 7e526810e8..7e526810e8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
index 3d74eba030..3d74eba030 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
index 8f89223e73..8f89223e73 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCalculationChain.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
index a02da05778..a02da05778 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestCommentsTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java
index 045a03601b..045a03601b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestExternalLinksTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
index 290e5fcd0c..290e5fcd0c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
index ae9d6398d4..ae9d6398d4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestSharedStringsTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
index a18313b577..a18313b577 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestStylesTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java b/ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java
index b50d691185..b50d691185 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/model/TestThemesTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
index 68398310f0..68398310f0 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
index f7161fd0e9..f7161fd0e9 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
index 74df887a50..74df887a50 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
index 2132956a66..2132956a66 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestOutlining.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
index a1377a3b5d..a1377a3b5d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFCell.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
index a344cb115f..a344cb115f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
index 3600479f31..3600479f31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
index b007d9b905..b007d9b905 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
index a29d0166e3..a29d0166e3 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
index 59a18bc7e5..59a18bc7e5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFRow.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
index 2d483e6185..2d483e6185 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
index cfb520e508..cfb520e508 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
index aba3a2f376..aba3a2f376 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
index e065b26adb..e065b26adb 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
index b1fa40fe69..b1fa40fe69 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
index 864ec3bc0d..864ec3bc0d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
index dfc129a47f..dfc129a47f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
index 600ce5c31d..600ce5c31d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
index b7f32acd67..b7f32acd67 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
index bac2e49688..bac2e49688 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
index 4c458ea42b..4c458ea42b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
index aeea648a29..aeea648a29 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
index 38ff1fc352..38ff1fc352 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
index f6b4e632b4..f6b4e632b4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestSheetHiding.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java
index e83cb1cd83..e83cb1cd83 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestTableStyles.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
index 4c9baa3a04..4c9baa3a04 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 562fa9f246..562fa9f246 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
index f677b5cc0f..f677b5cc0f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
index cefac9bb24..cefac9bb24 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
index 7f6978683f..7f6978683f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChart.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
index a97ca36e94..a97ca36e94 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
index 227dc3627b..227dc3627b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
index 88c54d7386..88c54d7386 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFColor.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
index aea85b4cc1..aea85b4cc1 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFComment.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
index 30d92dda2f..30d92dda2f 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
index b9e2474309..b9e2474309 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
index 18f4d51d5d..18f4d51d5d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
index 79d340ebe2..79d340ebe2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
index f85f0411ed..f85f0411ed 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
index c072013404..c072013404 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
index 431f585b60..431f585b60 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
index 7c119fa851..7c119fa851 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
index d717a699ea..d717a699ea 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
index 219b8423cc..219b8423cc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
index 1914f49d54..1914f49d54 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
index 8a67d6aa3b..8a67d6aa3b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
index 6ec3eb8aaa..6ec3eb8aaa 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
index 9a391019f5..9a391019f5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
index 887e23ae11..887e23ae11 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
index 7b56cf8965..7b56cf8965 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
index 654bf75b31..654bf75b31 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
index 203fbba80c..203fbba80c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
index 0792ddc655..0792ddc655 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFName.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
index 4113de6225..4113de6225 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
index 4f88009127..4f88009127 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
index b544f916ac..b544f916ac 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
index 5f8514c87b..5f8514c87b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
index fc001229ce..fc001229ce 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
index 29ddf4b7ea..29ddf4b7ea 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
index f0507e3590..f0507e3590 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
index 9a0215e1b0..9a0215e1b0 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
index 4e6899dfc2..4e6899dfc2 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFRow.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFShape.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java
index 67486d6f64..67486d6f64 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index 1ca51d3dcc..1ca51d3dcc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
index c9aacd2aa3..c9aacd2aa3 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
index 1cce6eb861..1cce6eb861 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
index b6dddc2c6d..b6dddc2c6d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
index 92d5735ec5..92d5735ec5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
index 06b15f7f4c..06b15f7f4c 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
index e31332027a..e31332027a 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
index 9217a2f431..9217a2f431 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
index db0bb77233..db0bb77233 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
index 83763bec73..83763bec73 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
index 8d641ca4dc..8d641ca4dc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
index ec13f604be..ec13f604be 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
index 74434b164b..74434b164b 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
index 506e0dead8..506e0dead8 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
index 3bd3012ef5..3bd3012ef5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
index 78563bc32e..78563bc32e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
index bbd1ee0981..bbd1ee0981 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
index 5954ffe7b3..5954ffe7b3 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
index 9a4bcf5c1e..9a4bcf5c1e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
index 87d793958e..87d793958e 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
index e98bfc1296..e98bfc1296 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
index c69af22ce4..c69af22ce4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
index 34acba6286..34acba6286 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
index 71ff251ede..71ff251ede 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
index 16f0fa68fe..16f0fa68fe 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
index bc1d6f2c50..bc1d6f2c50 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
index 5f905d8e7d..5f905d8e7d 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
index 735b0d5413..735b0d5413 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
index 6238a41713..6238a41713 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
index d3d875fc25..d3d875fc25 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
index e3c15ed123..e3c15ed123 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
index c8011af886..c8011af886 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
index 57591916d4..57591916d4 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java b/ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
index e7ba523ded..e7ba523ded 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/util/MemoryUsage.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
index 2d64973ad5..2d64973ad5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/util/TestCTColComparator.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
index 77a7e8be08..77a7e8be08 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java b/ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
index 856ea584bc..856ea584bc 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/util/TestNumericRanges.java
+++ b/ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
index 09355e810d..09355e810d 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
index 4aac209eb9..4aac209eb9 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
index 6840722c5d..6840722c5d 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
index 033c466cc6..033c466cc6 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
index 48b8d093da..48b8d093da 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
index d7cb2c23ad..d7cb2c23ad 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java
index d7c5f1e4b3..d7c5f1e4b3 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestExternalEntities.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 6e5716549b..6e5716549b 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
index d908d2c565..d908d2c565 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFDecorators.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
index d47d5ae944..d47d5ae944 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
index 39673c3bba..39673c3bba 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java
index de8d9541b9..de8d9541b9 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestColumn.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
index e71c3a2413..e71c3a2413 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
index 2974c879dc..2974c879dc 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
index eca90582e9..eca90582e9 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
index 79ffa2d701..79ffa2d701 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComments.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
index dad5ab877b..dad5ab877b 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
index db1b969b58..db1b969b58 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
index e375d710fb..e375d710fb 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
index 7292553715..7292553715 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
index 9d8e563326..9d8e563326 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
index e73baa056c..e73baa056c 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
index 73d2eebe20..73d2eebe20 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
index 5e34741aed..5e34741aed 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
index c1806c946a..c1806c946a 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index 73eb333e65..73eb333e65 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
index 7deb6f22a6..7deb6f22a6 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
index 1de994a804..1de994a804 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
index 235c17d3ab..235c17d3ab 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
index ffd9a5e02d..ffd9a5e02d 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
index 6c517f4c95..6c517f4c95 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
index 0feddb6819..0feddb6819 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
index 36d0277568..36d0277568 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
index 1c1fe03c88..1c1fe03c88 100644
--- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
+++ b/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
diff --git a/src/multimodule/ooxml/test9/module-info.class b/ooxml/src/test/java9/module-info.class
index 8fc0ead938..8fc0ead938 100644
--- a/src/multimodule/ooxml/test9/module-info.class
+++ b/ooxml/src/test/java9/module-info.class
diff --git a/src/multimodule/ooxml/test9/module-info.java b/ooxml/src/test/java9/module-info.java
index 152cab9e5c..152cab9e5c 100644
--- a/src/multimodule/ooxml/test9/module-info.java
+++ b/ooxml/src/test/java9/module-info.java
diff --git a/src/records/definitions/series_list_record.xml b/scratchpad/build.gradle
index 88eeb67046..9b0717e37a 100644
--- a/src/records/definitions/series_list_record.xml
+++ b/scratchpad/build.gradle
@@ -1,6 +1,4 @@
-<?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.
@@ -15,15 +13,21 @@
    WITHOUT 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>
+==================================================================== */
+
+dependencies {
+    api project(':main')
+    implementation "commons-codec:commons-codec:${commonsCodecVersion}"
+    implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+
+    testImplementation project(path: ':main', configuration: 'tests')
+}
+
+jar {
+    manifest {
+        attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad'
+    }
+}
+
+japicmp.baseline = "org.apache.poi:poi:${japicmpversion}@jar"
\ No newline at end of file
diff --git a/src/scratchpad/models/poi-hdf.zargo b/scratchpad/models/poi-hdf.zargo
index dde1132850..dde1132850 100644
--- a/src/scratchpad/models/poi-hdf.zargo
+++ b/scratchpad/models/poi-hdf.zargo
diff --git a/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java b/scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
index 70da34747b..70da34747b 100644
--- a/src/scratchpad/src/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
index 4f578c58f7..4f578c58f7 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/HDGFDiagram.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
index 9879eee028..9879eee028 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZW.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
index 9a8a7559a1..9a8a7559a1 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/HDGFLZWCompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
index 6ccc5a6797..6ccc5a6797 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/Chunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
index 76b5937338..76b5937338 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
index f5493ac643..f5493ac643 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
index 3dc1e8113e..3dc1e8113e 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
index b4eb9d83d7..b4eb9d83d7 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
index 2a221a7028..2a221a7028 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
index ee009db15e..ee009db15e 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkSeparator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
index 92160abb8e..92160abb8e 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/chunks/ChunkTrailer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java b/scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
index a82e914edd..a82e914edd 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/dev/VSDDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java b/scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
index c893bd2dfb..c893bd2dfb 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/exceptions/HDGFException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
index 570eaacf4c..570eaacf4c 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
index 06db8781b0..06db8781b0 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/pointers/Pointer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
index bb1d064369..bb1d064369 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java
index d276b909de..d276b909de 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV5.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
index 9983c4ccd4..9983c4ccd4 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/pointers/PointerV6.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
index b977483473..b977483473 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/ChunkStream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
index a8bea5ccd8..a8bea5ccd8 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/CompressedStreamStore.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
index e7f3cf39d4..e7f3cf39d4 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/PointerContainingStream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
index abd7f19e2c..abd7f19e2c 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/Stream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
index fa577ad2e9..fa577ad2e9 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/StreamStore.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
index ac6386adc4..ac6386adc4 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/StringsStream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
index 9e772c2f18..9e772c2f18 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/TrailerStream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
index e08d7f93c7..e08d7f93c7 100644
--- a/src/scratchpad/src/org/apache/poi/hdgf/streams/UnknownStream.java
+++ b/scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfDrawProperties.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java
index 5ec47cc054..5ec47cc054 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfDrawProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfGraphics.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
index 113f8ede25..113f8ede25 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfGraphics.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
index 95d3b7e70a..95d3b7e70a 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/draw/HemfImageRenderer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java
index 443a7ee4de..443a7ee4de 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfComment.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java
index 02366a5b8d..02366a5b8d 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfDraw.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
index 803fb98855..803fb98855 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFill.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java
index c7f189f1d5..c7f189f1d5 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfFont.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfHeader.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java
index d8d3d34c7c..d8d3d34c7c 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfHeader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfMisc.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java
index 996a44f08e..996a44f08e 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfMisc.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPalette.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java
index 607e30244e..607e30244e 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPalette.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPenStyle.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java
index 041f39423f..041f39423f 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfPenStyle.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java
index fe6a6ccf68..fe6a6ccf68 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
index afdcaa533f..afdcaa533f 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordType.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java
index 0066c8c16a..0066c8c16a 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfRecordType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfText.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java
index 9a8f629afc..9a8f629afc 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfText.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfWindowing.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java
index 46e28209f8..46e28209f8 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/HemfWindowing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
index 6a2fb0e6c9..6a2fb0e6c9 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
index 71ade3fdb3..71ade3fdb3 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
index b52e44b833..b52e44b833 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
index 857a8e93f5..857a8e93f5 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
index 2d8f3b0e45..2d8f3b0e45 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
index a271e77de1..a271e77de1 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
index 840b752f37..840b752f37 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
index eaaf0a88f1..eaaf0a88f1 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
index 1e04c5524e..1e04c5524e 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
index a69f4954e1..a69f4954e1 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
index cd00d453cc..cd00d453cc 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
index 99210ad7ab..99210ad7ab 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
index 032ef0a86c..032ef0a86c 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
index acbba48668..acbba48668 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
index 9ccfb5ff6a..9ccfb5ff6a 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
index 74c8e6c458..74c8e6c458 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
index 1b02478861..1b02478861 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfPicture.java b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java
index e5964ae871..e5964ae871 100644
--- a/src/scratchpad/src/org/apache/poi/hemf/usermodel/HemfPicture.java
+++ b/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/Attachment.java b/scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
index 1e164dbaae..1e164dbaae 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/Attachment.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java b/scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
index c3e2ab0c38..c3e2ab0c38 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/CompressedRTF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java b/scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
index 6997cbf87b..6997cbf87b 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/HMEFMessage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
index 0533705c2e..0533705c2e 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
index 59d7be584d..59d7be584d 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
index 295a022db8..295a022db8 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
index 9ad7a09997..9ad7a09997 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
index 547bad8e11..547bad8e11 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
index 1c64dbe3c1..1c64dbe3c1 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
index 9bf6d4073f..9bf6d4073f 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
index e90c910470..e90c910470 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFProperty.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
index d42feaa51a..d42feaa51a 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java b/scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
index d0019cebf4..d0019cebf4 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/dev/HMEFDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java b/scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
index 4c95ecb19f..4c95ecb19f 100644
--- a/src/scratchpad/src/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java b/scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
index 1f600977c3..1f600977c3 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/HPBFDocument.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
index a638ba9e77..a638ba9e77 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/dev/HPBFDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
index 3c222d51b2..3c222d51b2 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/dev/PLCDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
index ac7ed74153..ac7ed74153 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
index 3f4784ac4a..3f4784ac4a 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherDelayStm.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
index 47b16b7d4e..47b16b7d4e 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherPart.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
index 07cd4c66ac..07cd4c66ac 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/EscherStm.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
index ae6e8fdad7..ae6e8fdad7 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/HPBFPart.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
index d1c5e3ff61..d1c5e3ff61 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/MainContents.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
index 6d5b67173a..6d5b67173a 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/QuillContents.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
index dddbdde5bb..dddbdde5bb 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCBit.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
index 57146192ff..57146192ff 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
index cc153708bb..cc153708bb 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
index 64dae7ba11..64dae7ba11 100644
--- a/src/scratchpad/src/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
+++ b/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
index bb5904da55..bb5904da55 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/Bitmap.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
index 1840d55409..1840d55409 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/DIB.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
index e6bf60da16..e6bf60da16 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/EMF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
index cf90746d6b..cf90746d6b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/JPEG.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
index ea855d460e..ea855d460e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/Metafile.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
index a6c2765ec7..a6c2765ec7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/PICT.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
index 197cb3d828..197cb3d828 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/PNG.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java b/scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
index 55b74bdb6f..55b74bdb6f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/blip/WMF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
index d44204331a..d44204331a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/PPDrawingTextListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
index 4e431976a3..4e431976a3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/PPTXMLDump.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
index ff42ce0a45..ff42ce0a45 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
index bb53698f7c..bb53698f7c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SLWTTextListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
index a4ed6d28b6..a4ed6d28b6 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
index e80cbc18ec..e80cbc18ec 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideIdListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
index 230892e61f..230892e61f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
index cff59a70c5..cff59a70c5 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
index 8df3ef0f01..8df3ef0f01 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/TextStyleListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
index 116582e7f3..116582e7f3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
index 3c61039483..3c61039483 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
index de9d534777..de9d534777 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
index f534d9ce0d..f534d9ce0d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/exceptions/HSLFException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
index fbb2f6d5f9..fbb2f6d5f9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
index 926aada0ec..926aada0ec 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/ImageExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
index 1c2a0e6d79..1c2a0e6d79 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
index f8c02deac7..f8c02deac7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/ActiveXShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java
index 54495aab2a..54495aab2a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/HSLFMetroShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
index 64b6dc6a35..64b6dc6a35 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/HeadersFooters.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
index ee00ae73ab..ee00ae73ab 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/MovieShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
index 061e89555c..061e89555c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Polygon.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
index 17d5ea5610..17d5ea5610 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
index 4b7046626e..4b7046626e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
index b1bf586199..b1bf586199 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
index a8db55e521..a8db55e521 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
index 247077404b..247077404b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
index e62b4b9b63..e62b4b9b63 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/IndentProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
index 0ffc38e5b3..0ffc38e5b3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
index 96c0694208..96c0694208 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
index 927cbe553d..927cbe553d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPFException9.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
index ba4eb1ecd0..ba4eb1ecd0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
index 9155731dcd..9155731dcd 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
index 27d0d5d9e4..27d0d5d9e4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
index 9bf2bf789f..9bf2bf789f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfo.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
index f89e188f14..f89e188f14 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/AnimationInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
index 79d8d9da7d..79d8d9da7d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/BinaryTagDataBlob.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CString.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
index 329915f93e..329915f93e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/CString.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
index 8625245844..8625245844 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ColorSchemeAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
index 69c8d2181f..69c8d2181f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
index 00c3cdef01..00c3cdef01 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Comment2000Atom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
index ebb3fc01b9..ebb3fc01b9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/CurrentUserAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java
index a43e475034..a43e475034 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DocInfoListContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
index 73489a9d2f..73489a9d2f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
index 273c3a6a2c..273c3a6a2c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
index bb498f2088..bb498f2088 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
index db7a0cb943..db7a0cb943 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
index cc99aa2f98..cc99aa2f98 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/DummyRecordWithChildren.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
index a8bebeaeaa..a8bebeaeaa 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Environment.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
index 28dff25ce9..28dff25ce9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/EscherPlaceholder.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
index 7cfe763f98..7cfe763f98 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/EscherTextboxWrapper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
index 62a5c4bbe3..62a5c4bbe3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExAviMovie.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
index 58be5715ee..58be5715ee 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExControl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
index 58d27ef340..58d27ef340 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExControlAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
index f9443b85d0..f9443b85d0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
index f3c3a48f43..f3c3a48f43 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbedAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
index 945a8df41b..945a8df41b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
index ba63ac5da6..ba63ac5da6 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlinkAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
index 81654dfded..81654dfded 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExMCIMovie.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
index 486b976f66..486b976f66 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExMediaAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
index bee803a21b..bee803a21b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjList.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
index 5fab662c42..5fab662c42 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjListAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java
index a1e3d168c8..a1e3d168c8 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExObjRefAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
index 321f09cb41..321f09cb41 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
index 4fc8a838e0..4fc8a838e0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
index c6935e84dd..c6935e84dd 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
index 665824fcc8..665824fcc8 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontEmbeddedData.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java
index b9acb2e3bf..b9acb2e3bf 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/FontEmbeddedData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
index 0d576f6a6a..0d576f6a6a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/FontEntityAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
index af0e0a5ec5..af0e0a5ec5 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
index 36ed8229c2..36ed8229c2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
index 42f8d017ca..42f8d017ca 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
index 2c1bd86229..2c1bd86229 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
index 38b0c6ecc9..38b0c6ecc9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
index 3543010612..3543010612 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
index e771fcf57d..e771fcf57d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/MainMaster.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
index 1e3cf364a4..1e3cf364a4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/MasterTextPropAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
index 4854426283..4854426283 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Notes.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
index 655898adb8..655898adb8 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/NotesAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
index af3595fecb..af3595fecb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/OEPlaceholderAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
index e521c74383..e521c74383 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/OutlineTextRefAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
index 396fbc06f4..396fbc06f4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
index 6ff8b4577f..6ff8b4577f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
index b2d84373cb..b2d84373cb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
index 1ee2403cf7..1ee2403cf7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
index 339331865c..339331865c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
index 844c14d45d..844c14d45d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
index dce90a981d..dce90a981d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
index fdd61d9cf2..fdd61d9cf2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
index be3bde7aab..be3bde7aab 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
index 4de227a2c2..4de227a2c2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
index 635ad85b28..635ad85b28 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
index c57003c89b..c57003c89b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RecordTypes.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
index 283c65ba43..283c65ba43 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
index 7bd098f92b..7bd098f92b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SSSlideInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
index 08c05c46af..08c05c46af 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SheetContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
index cf8d2466c0..cf8d2466c0 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
index 5728bacf4c..5728bacf4c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtomLayout.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java
index e91bc7ddb4..e91bc7ddb4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlideAtomLayout.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
index d0298a5be2..d0298a5be2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
index d52552ab7b..d52552ab7b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SlidePersistAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
index 2df455bd9e..2df455bd9e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Sound.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
index 3fda587c6e..3fda587c6e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SoundCollection.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
index 0989052c56..0989052c56 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/SoundData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
index 20317e3074..20317e3074 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextProp9Atom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
index de2b28c311..de2b28c311 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
index 81a503b95c..81a503b95c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextBytesAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
index 768aaba6ef..768aaba6ef 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextCharsAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
index 187e2f4bce..187e2f4bce 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
index 5de317cc0c..5de317cc0c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextRulerAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
index b26e9cb04b..b26e9cb04b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java
index 9c890a2b56..9c890a2b56 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TextSpecInfoRun.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
index f5896aa817..f5896aa817 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
index a396cd95bf..a396cd95bf 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/TxMasterStyleAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
index 886a0dd20f..886a0dd20f 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
index b89da4a98c..b89da4a98c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/UserEditAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java
index 4607bb6141..4607bb6141 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoAtom.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java
index 043cea2286..043cea2286 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
index c02561d8c7..c02561d8c7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java
index 8f477f9562..8f477f9562 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFBackground.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFComment.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java
index 0548fca452..0548fca452 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFComment.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
index d87f24b01b..d87f24b01b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
index bb2c52b214..bb2c52b214 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFill.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfo.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
index 3b509276ca..3b509276ca 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
index d2dc44095e..d2dc44095e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
index 0a3bcc91bb..0a3bcc91bb 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
index cfa09db8a4..cfa09db8a4 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
index 5575d16bb7..5575d16bb7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java
index 1e42326f26..1e42326f26 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFLine.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
index 5c424cc8a7..5c424cc8a7 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java
index 9377bfa439..9377bfa439 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFNotes.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java
index 60f864188d..60f864188d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
index 344e038374..344e038374 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java
index 7f9b54eb09..7f9b54eb09 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
index 6aba4b23ff..6aba4b23ff 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
index 4b13300590..4b13300590 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
index 906e51c44b..906e51c44b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
index 8fed381c38..8fed381c38 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
index 47c895e0e3..47c895e0e3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
index b13789f843..b13789f843 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
index dc32a2d109..dc32a2d109 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
index 9a010661c5..9a010661c5 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
index cc9932a61c..cc9932a61c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java
index 7d1b6711ee..7d1b6711ee 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
index 2f258e6eb6..2f258e6eb6 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
index 5e2e5d9ebc..5e2e5d9ebc 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
index 42682f550d..42682f550d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
index 936eae064e..936eae064e 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
index f697e859ce..f697e859ce 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java
index dda143735a..dda143735a 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java
index 6218e1e5ed..6218e1e5ed 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java
index 0956e6f31d..0956e6f31d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java
index 485389dcdd..485389dcdd 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextBox.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
index 3f1e48c6af..3f1e48c6af 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java
index 2ffd690264..2ffd690264 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextRun.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
index 9a60a2e8ae..9a60a2e8ae 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
index 59b0e3f287..59b0e3f287 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
diff --git a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java b/scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
index 10b566a8be..10b566a8be 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/util/SystemTimeUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java b/scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
index 6e36712276..6e36712276 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
index 83e5159813..83e5159813 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
index ab5ca3a84e..ab5ca3a84e 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
index ce977b83b1..ce977b83b1 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
index 5073771fc3..5073771fc3 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
index ac3dfe7521..ac3dfe7521 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
index 273950b28c..273950b28c 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroup.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
index e29d01b804..e29d01b804 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
index 041ab37556..041ab37556 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Chunks.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
index 2b42db7209..2b42db7209 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
index 81c431b2b7..81c431b2b7 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MAPIProperty.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
index e93446e294..e93446e294 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
index f1ef43c766..f1ef43c766 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
index 6af621e26f..6af621e26f 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/NameIdChunks.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
index 6cf92111a6..6cf92111a6 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
index 1d809cba8d..1d809cba8d 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/PropertyValue.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
index 8b37806fdc..8b37806fdc 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/RecipientChunks.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
index 50b393d21b..50b393d21b 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
index 8e63bddd23..8e63bddd23 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/StringChunk.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
index 4c92da4f0f..4c92da4f0f 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/datatypes/Types.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
index 002792d191..002792d191 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/dev/HSMFDump.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
index 6cb05b30fb..6cb05b30fb 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/dev/TypesLister.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java b/scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
index 9f00435369..9f00435369 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java b/scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
index a818d03280..a818d03280 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
index 086a653086..086a653086 100644
--- a/src/scratchpad/src/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
+++ b/scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
index 6f5ab29bb4..6f5ab29bb4 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
index aa8863f841..aa8863f841 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/AbstractExcelUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
index 50cf5427b2..50cf5427b2 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
index 0110c71ec9..0110c71ec9 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
index 63e71d9b98..63e71d9b98 100644
--- a/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
index f0993b24da..f0993b24da 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
index 701ab2d54e..701ab2d54e 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphics.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphicsState.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
index e04046f4c2..e04046f4c2 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfImageRenderer.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
index 9a44028f07..9a44028f07 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP2Composite.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
index 85cba2371a..85cba2371a 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP3Composite.java b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
index 6cac2a5dca..6cac2a5dca 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
index 5325931dbe..5325931dbe 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java
index cc103b2c06..cc103b2c06 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmap16.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java
index 91597803e1..91597803e1 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBitmapDib.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java
index 2d2c74577c..2d2c74577c 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfBrushStyle.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java
index 6cb4c41def..6cb4c41def 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfColorRef.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java
index 1c99601642..1c99601642 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfDraw.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java
index 82baf52036..82baf52036 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfEscape.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java
index 90fe33881e..90fe33881e 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFill.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
index ff64eee42d..ff64eee42d 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfFont.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java
index addf32d652..addf32d652 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHatchStyle.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java
index 2f1ada526b..2f1ada526b 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfHeader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java
index 2e09606bdd..2e09606bdd 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMapMode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
index b4ecc2fc3c..b4ecc2fc3c 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfMisc.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
index 0aad3d6d16..0aad3d6d16 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java
index efaa774497..efaa774497 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPalette.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java
index fced0a24a5..fced0a24a5 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPenStyle.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
index 82aba4b12d..82aba4b12d 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java
index b68af18460..b68af18460 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecord.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java
index 297808debd..297808debd 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRecordType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRegionMode.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java
index 903cc39eee..903cc39eee 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfRegionMode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
index 2f79af4087..2f79af4087 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java
index 6f72d28650..6f72d28650 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfText.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java
index d323f86106..d323f86106 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/record/HwmfWindowing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
index 1897278420..1897278420 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
index 2bb9187988..2bb9187988 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
index 19fda80509..19fda80509 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
index e9e96edb1c..e9e96edb1c 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
index 0fb9637f6a..0fb9637f6a 100644
--- a/src/scratchpad/src/org/apache/poi/hwmf/usermodel/HwmfPicture.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
index 6571c650af..6571c650af 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
index 66c3b51bcc..66c3b51bcc 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocumentCore.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
index a5a3d441cb..a5a3d441cb 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFOldDocument.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java b/scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
index cfa97bc70e..cfa97bc70e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/OldWordFileFormatException.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java b/scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
index 743cc40c2b..743cc40c2b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/QuickTest.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
index 1ff262d456..1ff262d456 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
index 1f633c5767..1f633c5767 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
index b9845fd348..b9845fd348 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
index b9c449be63..b9c449be63 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/FoDocumentFacade.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
index a8b07c085a..a8b07c085a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/FontReplacer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
index fe75ad1499..fe75ad1499 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
index 4a69de63c5..4a69de63c5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/NumberFormatter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
index e8bb2e2c5a..e8bb2e2c5a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/PicturesManager.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
index c92b3d56a3..c92b3d56a3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/TextDocumentFacade.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
index d91708424c..d91708424c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
index 32cf161a5c..32cf161a5c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
index a60d504405..a60d504405 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
index 484d367788..484d367788 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
index cebc55b743..cebc55b743 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToTextConverter.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
index 1c15980b90..1c15980b90 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/dev/FieldIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
index 6d487487bc..6d487487bc 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/dev/HWPFLister.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
index 6ecb5c33df..6ecb5c33df 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/dev/RecordUtil.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
index 526d21be35..526d21be35 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
index 1cd5d0d654..1cd5d0d654 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
index 0de0daf226..0de0daf226 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
index 1ffdbc635d..1ffdbc635d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/BookmarksTables.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
index 9ad54d7d9c..9ad54d7d9c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/BytePropertyNode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
index 178186bd35..178186bd35 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPBinTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
index 349f39b634..349f39b634 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
index 27d60ad833..27d60ad833 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/CHPX.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
index 2ab1735cdd..2ab1735cdd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/CharIndexTranslator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
index 7ae494fb05..7ae494fb05 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Colorref.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
index 7dc6081cc5..7dc6081cc5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ComplexFileTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
index f292643fb1..f292643fb1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/DocumentProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
index a33e5af350..a33e5af350 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FFData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
index b12fe40691..b12fe40691 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FFDataBase.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
index 227df337c0..227df337c0 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FIBFieldHandler.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
index 3688914061..3688914061 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPA.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
index 287b64d932..287b64d932 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPADocumentPart.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
index 5da742096d..5da742096d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FSPATable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
index 532318d739..532318d739 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Ffn.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
index 8f505b9588..8f505b9588 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FibBase.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
index d6bb805dd5..d6bb805dd5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
index f2834eff39..f2834eff39 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw95.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
index 933afd0ca0..933afd0ca0 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgLw97.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
index c3b0f6bd9c..c3b0f6bd9c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FibRgW97.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
index 58e55a46cd..58e55a46cd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
index 0a3de3030e..0a3de3030e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsDocumentPart.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
index 595078e47f..595078e47f 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FieldsTables.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
index 0fb355cc4a..0fb355cc4a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FileInformationBlock.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
index 8fba06f82b..8fba06f82b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FontTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
index 6c21ff2fd7..6c21ff2fd7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
index 4c82d2db25..4c82d2db25 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/FormattedDiskPage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
index 802530745c..802530745c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/GenericPropertyNode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
index f627289a48..f627289a48 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Grfhic.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
index ac391ba780..ac391ba780 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Hyphenation.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
index edc069964a..edc069964a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/LFO.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
index 2f22afdd51..2f22afdd51 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
index 3a50a7c2f3..3a50a7c2f3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/LFOLVLBase.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
index 9e00ffed40..9e00ffed40 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/LSTF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
index 38192d263d..38192d263d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/LVLF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
index a6d817a72f..a6d817a72f 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
index 8f23eeb5cb..8f23eeb5cb 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
index f13e9a3884..f13e9a3884 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListLevel.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
index e163b2f005..e163b2f005 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ListTables.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
index 3377c8cd9c..3377c8cd9c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/NilPICFAndBinData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
index 8168e96ae3..8168e96ae3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/NoteType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
index 92fa5287f0..92fa5287f0 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/NotesTables.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
index 35436bf75a..35436bf75a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
index 04fdd322a2..04fdd322a2 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldCHPBinTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldComplexFileTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java
index 25510c89e9..25510c89e9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldComplexFileTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java
index 38c0d53cab..38c0d53cab 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFfn.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java
index d4935a1ba6..d4935a1ba6 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldFontTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
index 0f7c90d529..0f7c90d529 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldPAPBinTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
index 684d3bd8b5..684d3bd8b5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldSectionTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java
index b14c38223d..b14c38223d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPiece.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java
index e6a0887f32..e6a0887f32 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OldTextPieceTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
index 675b62e8be..675b62e8be 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPBinTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
index e9c56cc558..e9c56cc558 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
index 2825f45db4..2825f45db4 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PAPX.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
index 44ab74078b..44ab74078b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PICF.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
index fb34604169..fb34604169 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
index 4f966badd7..4f966badd7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/ParagraphHeight.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
index e01f6ff0e1..e01f6ff0e1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PicturesTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
index 4d4d3ade78..4d4d3ade78 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PieceDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
index 658cb60c9e..658cb60c9e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
index 15793b7a4e..15793b7a4e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfField.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
index b2adc51ef1..b2adc51ef1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlfLfo.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
index a2e0bd2ff3..a2e0bd2ff3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyModifier.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
index 7784e41255..7784e41255 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PropertyNode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
index 2c4bd5521c..2c4bd5521c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
index f9a5fd64c2..f9a5fd64c2 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SEPX.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
index b6a5796a3d..b6a5796a3d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByEntry.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
index e8eff88eb1..e8eff88eb1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SavedByTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
index 36832e6c45..36832e6c45 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
index 547960c185..547960c185 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SectionTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
index 6622cc7d10..6622cc7d10 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SinglentonTextPiece.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
index 395d129b3a..395d129b3a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfBase.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
index b0eaede7a1..b0eaede7a1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/StdfPost2000.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
index bb1cced65a..bb1cced65a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Stshif.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
index 85343ee242..85343ee242 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Sttb.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
index 850d40d509..850d40d509 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SttbUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
index 05b2c04677..05b2c04677 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleDescription.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
index ac37396657..ac37396657 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/StyleSheet.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
index 89d16d2e02..89d16d2e02 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/SubdocumentType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
index 01c04b120e..01c04b120e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/TabDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
index 0c606cbf03..0c606cbf03 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPiece.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
index cd885b9556..cd885b9556 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/TextPieceTable.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
index 5de2fe5248..5de2fe5248 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/UPX.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
index 89d5c492fd..89d5c492fd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/UnhandledDataStructure.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
index 769786afb8..769786afb8 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Xst.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
index 34acfb99dc..34acfb99dc 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/Xstz.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
index 1d1b403439..1d1b403439 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
index 660f4f5824..660f4f5824 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/BKFAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
index e18a3e724b..e18a3e724b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/CHPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
index 6ba7a30183..6ba7a30183 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/DOPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
index 33557615f6..33557615f6 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
index 3da59198d9..3da59198d9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FLDAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
index 1c75451897..1c75451897 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FRDAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
index 8d7df40e36..8d7df40e36 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
index de588af3d9..de588af3d9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
index 45b97641d5..45b97641d5 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
index 48bfcebfd6..48bfcebfd6 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
index 21d2e4ae13..21d2e4ae13 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
index a6433f8597..a6433f8597 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
index d4e410e2a3..d4e410e2a3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
index 7f37e95a27..7f37e95a27 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
index 81bc72a117..81bc72a117 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
index 2565e1e306..2565e1e306 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
index 79ade79b26..79ade79b26 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
index 220a6aff63..220a6aff63 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PAPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
index 22d4b22dbe..22d4b22dbe 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/PICFAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
index f74a1afab4..f74a1afab4 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SEPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
index 985ddbe633..985ddbe633 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
index c31f5a9a93..c31f5a9a93 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/SHDAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
index 8282e38933..8282e38933 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
index 26e5fd68fc..26e5fd68fc 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
index 5b72d2e5c8..5b72d2e5c8 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/StshifAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
index ffed2cbcc1..ffed2cbcc1 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TAPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
index f167ebf398..f167ebf398 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TBDAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
index e02d6a1939..e02d6a1939 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TCAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
index 6d0e426989..6d0e426989 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/types/TLPAbstractType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
index 7abe46e8ec..7abe46e8ec 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
index bad4429041..bad4429041 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
index 65112c748d..65112c748d 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
index d1d41919fc..d1d41919fc 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
index fe2480fdc4..fe2480fdc4 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
index 68375bb443..68375bb443 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
index 201d069742..201d069742 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmBuffer.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
index dd4ba7962f..dd4ba7962f 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
index 705de1f1c9..705de1f1c9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmOperation.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
index ef2e117ead..ef2e117ead 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUncompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
index 8563749a64..8563749a64 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/SprmUtils.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
index 9c76e2ec13..9c76e2ec13 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
index 9feb5057a3..9feb5057a3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
index 1836d8906c..1836d8906c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmark.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
index c4dae5e9db..c4dae5e9db 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Bookmarks.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
index 7c9d7ad9d7..7c9d7ad9d7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
index 9f2c1ab466..9f2c1ab466 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/BorderCode.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
index 71e98888e0..71e98888e0 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
index 96fb227dd9..96fb227dd9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/CharacterRun.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
index 38c4a2895c..38c4a2895c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DateAndTime.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
index c5589f0d52..c5589f0d52 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
index de7ebcd3fe..de7ebcd3fe 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Field.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
index 37131c3e15..37131c3e15 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
index 2db551e5e2..2db551e5e2 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Fields.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
index b57d70ebd7..b57d70ebd7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/FieldsImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
index 2f100bb658..2f100bb658 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HWPFList.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
index b15757ae03..b15757ae03 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/HeaderStories.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
index 8849f8aa75..8849f8aa75 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
index d7158fac75..d7158fac75 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ListEntry.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
index 9e6cf567f3..9e6cf567f3 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Notes.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
index 16c8ada155..16c8ada155 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/NotesImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
index c672134ec4..c672134ec4 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
index d9f39d7543..d9f39d7543 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ObjectsPool.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
index 4bed04e495..4bed04e495 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
index 58661aa8dd..58661aa8dd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
index ec5477725a..ec5477725a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
index e5d1395f75..e5d1395f75 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Paragraph.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
index f1c78be1d9..f1c78be1d9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
index 913b4950ae..913b4950ae 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Picture.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
index 8f7de73d7c..8f7de73d7c 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
index e630925dcd..e630925dcd 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/PictureType.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
index 0b6cbcb644..0b6cbcb644 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
index ac0e6f25af..ac0e6f25af 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
index 72f688ad3a..72f688ad3a 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/SectionProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
index 5274645f51..5274645f51 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
index aefd3feb9f..aefd3feb9f 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
index 40ef0d4219..40ef0d4219 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
index 8893c4da2b..8893c4da2b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
index 3dca841c89..3dca841c89 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCell.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
index e7e99373c7..e7e99373c7 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
index b2b11d288e..b2b11d288e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableIterator.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
index eec31c4815..eec31c4815 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableProperties.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
index 9e70662ead..9e70662ead 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/TableRow.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/util/DoubleByteUtil.java b/scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java
index 5d55711ed9..5d55711ed9 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/util/DoubleByteUtil.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java b/scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
index 27f796c11e..27f796c11e 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
+++ b/scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
diff --git a/src/multimodule/scratchpad/java9/module-info.class b/scratchpad/src/main/java9/module-info.class
index 037213fa66..037213fa66 100644
--- a/src/multimodule/scratchpad/java9/module-info.class
+++ b/scratchpad/src/main/java9/module-info.class
diff --git a/src/multimodule/scratchpad/java9/module-info.java b/scratchpad/src/main/java9/module-info.java
index 1e90ca572d..1e90ca572d 100644
--- a/src/multimodule/scratchpad/java9/module-info.java
+++ b/scratchpad/src/main/java9/module-info.java
diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index b4c821cdb6..b4c821cdb6 100644
--- a/src/resources/scratchpad/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index c3149c3aa9..c3149c3aa9 100644
--- a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
index 1fcb1ec7c7..1fcb1ec7c7 100644
--- a/src/resources/scratchpad/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
+++ b/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
diff --git a/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl b/scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl
index 7cb715abd6..7cb715abd6 100644
--- a/src/resources/scratchpad/org/apache/poi/hdgf/chunks_parse_cmds.tbl
+++ b/scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl
diff --git a/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt b/scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt
index 3978b10340..3978b10340 100644
--- a/src/resources/scratchpad/org/apache/poi/hslf/data/empty.ppt
+++ b/scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
index 9c78ba3b61..9c78ba3b61 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
index 86163afe33..86163afe33 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFLZW.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java b/scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
index 3b97b03b50..3b97b03b50 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/chunks/TestChunks.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java b/scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
index 302eacc928..302eacc928 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
index dc747a07a5..dc747a07a5 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java b/scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
index 3beedf60c0..3beedf60c0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/pointers/TestPointerFactory.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
index 1e18b98478..1e18b98478 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/StreamTest.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
index 847eaa05d1..847eaa05d1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBasics.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
index 47f33d0a15..47f33d0a15 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
index e65121ffaf..e65121ffaf 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
+++ b/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java b/scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
index af9a80c799..af9a80c799 100644
--- a/src/scratchpad/testcases/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java b/scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
index 6d39586729..6d39586729 100644
--- a/src/scratchpad/testcases/org/apache/poi/hemf/usermodel/TestHemfPicture.java
+++ b/scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
index bdcc28df7d..bdcc28df7d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/TestAttachments.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
index 704c85ef97..704c85ef97 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/TestBugs.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
index 3d0b3412f9..3d0b3412f9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/TestCompressedRTF.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java b/scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
index d0359a6d2e..d0359a6d2e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/TestHMEFMessage.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
index 2ece5a0a3a..2ece5a0a3a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
index c103bbc9e0..c103bbc9e0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/dev/TestHMEFDumper.java b/scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
index a24901a96d..a24901a96d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/dev/TestHMEFDumper.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java b/scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
index 4a786f5bca..4a786f5bca 100644
--- a/src/scratchpad/testcases/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java b/scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
index eccb4ce8ec..eccb4ce8ec 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
+++ b/scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java b/scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
index 13fae5982f..13fae5982f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
index c96fdbda80..c96fdbda80 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
+++ b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
index 8fd5a6bf3b..8fd5a6bf3b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
+++ b/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java b/scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
index 0ec92bb6a2..0ec92bb6a2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/HSLFTestDataSamples.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
index 64e61a4c14..64e61a4c14 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestPOIDocumentScratchpad.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
index 774b1fb91b..774b1fb91b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
index 5aec58964a..5aec58964a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
index 200966fd7a..200966fd7a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java b/scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
index 5c8463ca3e..5c8463ca3e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/BaseTestPPTIterating.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
index 6722f00f41..6722f00f41 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
index 206db2b20a..206db2b20a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPTXMLDump.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java
index c0572750b6..c0572750b6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestPPTXMLDump.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
index 8ee2010fa7..8ee2010fa7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTTextListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java
index c61dd00b24..c61dd00b24 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTTextListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
index ea37f7d159..ea37f7d159 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideIdListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java
index b75bec5178..b75bec5178 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideIdListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowDumper.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java
index 51b9ee5d69..51b9ee5d69 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowDumper.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
index 4392ec603a..4392ec603a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestTextStyleListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java
index 5a5d826ef1..5a5d826ef1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestTextStyleListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
index c284ce1ba3..c284ce1ba3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
index 71e1258d1e..71e1258d1e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
index bd8d634b12..bd8d634b12 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
index 8016278617..8016278617 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestFreeform.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
index dfcb4d339b..dfcb4d339b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
index 8d31b900bf..8d31b900bf 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
index 0384b19043..0384b19043 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestLine.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
index a90c591190..a90c591190 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
index 9c561fb18e..9c561fb18e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
index 7045751956..7045751956 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
index 9ab28fa66c..9ab28fa66c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
index 774fe06468..774fe06468 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
index 50fada2805..50fada2805 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
index 7557a8bc17..7557a8bc17 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
index a50958ff79..a50958ff79 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
index c539a09b03..c539a09b03 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
index 1777ffed2c..1777ffed2c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
index f6f7fe6f7c..f6f7fe6f7c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
index 21d25007db..21d25007db 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
index a117037832..a117037832 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCString.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
index 768ca20623..768ca20623 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestColorSchemeAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
index 19a12a95a2..19a12a95a2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
index 0568afaef5..0568afaef5 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestComment2000Atom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
index 030b954d3c..030b954d3c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
index 949a0c1ac4..949a0c1ac4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
index 06bca9df9b..06bca9df9b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
index 55944a5246..55944a5246 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
index ac837fc582..ac837fc582 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
index c7bd84e116..c7bd84e116 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExControl.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
index 13fea4a83a..13fea4a83a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
index fb8072bd44..fb8072bd44 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
index 5b961d5816..5b961d5816 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExMediaAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
index 0301b61463..0301b61463 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
index 9256b01b9f..9256b01b9f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjListAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
index 4c7771cac8..4c7771cac8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
index fcdadfe211..fcdadfe211 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExOleObjStg.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
index 2534fddd18..2534fddd18 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExVideoContainer.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
index f5b64da586..f5b64da586 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestFontCollection.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
index 3edfadb3de..3edfadb3de 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
index f6a25739b2..f6a25739b2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
index 7da5ee6f5c..7da5ee6f5c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfo.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
index 7f9bcde86e..7f9bcde86e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
index e2852088dc..e2852088dc 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestNotesAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
index dccb8f2cad..dccb8f2cad 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
index 869dc427d7..869dc427d7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordTypes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
index ef3c7b84b4..ef3c7b84b4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
index 2a638d5a9a..2a638d5a9a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlidePersistAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
index 4bfbc23526..4bfbc23526 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
index 887814ab43..887814ab43 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
index 44f2dc4617..44f2dc4617 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextBytesAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
index 4c1a71daa0..4c1a71daa0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextCharsAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
index 4935940afb..4935940afb 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextHeaderAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
index e50419c410..e50419c410 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextRulerAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
index 578c6eef89..578c6eef89 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
index 12874ec041..12874ec041 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
index 93f37305a9..93f37305a9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
index c09e1e55b3..c09e1e55b3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestUserEditAtom.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
index 35e5880406..35e5880406 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java
index 38bc03bb28..38bc03bb28 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBackground.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
index 17ddfa4a8a..17ddfa4a8a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
index d4dce2b13f..d4dce2b13f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
index b3d6785aec..b3d6785aec 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
index e1f453327d..e1f453327d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
index d82c659d71..d82c659d71 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
index d96201b89f..d96201b89f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
index 69863e5685..69863e5685 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
index 6591a13ac7..6591a13ac7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
index 6e49fd10d7..6e49fd10d7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
index 6aa90ff6d9..6aa90ff6d9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java
index 55a50be321..55a50be321 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
index a196ed685b..a196ed685b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
index 0b9255050b..0b9255050b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
index 0eba4ae56e..0eba4ae56e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
index 8081528a9f..8081528a9f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
index a2c0469bc1..a2c0469bc1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
index 0a5df4dde3..0a5df4dde3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
index 3ac70bd00d..3ac70bd00d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
index 1176003e7a..1176003e7a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
index 6fc4dc6030..6fc4dc6030 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java
index 1b577eb273..1b577eb273 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextShape.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java b/scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
index 6572ade892..6572ade892 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/util/TestSystemTimeUtils.java
+++ b/scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java b/scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java
index deecb942ab..deecb942ab 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/Test7BitCodepage.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
index ce219e3e04..ce219e3e04 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBasics.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
index 8b9e162bae..8b9e162bae 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestBlankFileRead.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
index 4f0322b806..4f0322b806 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
index 1d8cc9f98a..1d8cc9f98a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
index 04131f3a23..04131f3a23 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestFixedSizedProperties.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
index 7426a44482..7426a44482 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
index eab6b64d6c..eab6b64d6c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java
index dfb7a765e5..dfb7a765e5 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestNameIdChunks.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
index c406b76057..c406b76057 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java b/scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
index ecbb8f2550..ecbb8f2550 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
index d61ec49805..d61ec49805 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestChunkData.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
index d9f0a110c6..d9f0a110c6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
index 4951b535d4..4951b535d4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestSorters.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
index 468e569383..468e569383 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/datatypes/TestTypes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
index bb3c4b3cd0..bb3c4b3cd0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java b/scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
index f2070fcdb3..f2070fcdb3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
+++ b/scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java b/scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
index 67ccae0cb4..67ccae0cb4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
+++ b/scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java b/scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java
index dff936b099..dff936b099 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwmf/TestHwmfParsing.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java b/scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java
index 840202da75..840202da75 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwmf/TestRasterOp.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
index ea2a93cc12..ea2a93cc12 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
index 937bb5367d..937bb5367d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestCase.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
index 142ad026e4..142ad026e4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
index 1e1b5b3841..1e1b5b3841 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestFieldsTables.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
index 9a9b942a25..9a9b942a25 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
index d7d7ed6249..d7d7ed6249 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFRangeParts.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
index f666517e51..f666517e51 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
index bb28ff5196..bb28ff5196 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestNumberFormatter.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
index fcae380bbf..fcae380bbf 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
index 62c1c955e0..62c1c955e0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
index a7e8b1fec7..a7e8b1fec7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
index 9ffea802cf..9ffea802cf 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java b/scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
index 3a94a3efb4..3a94a3efb4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
index 1574c3410a..1574c3410a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
index f250b5daa4..f250b5daa4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
index 5575a09291..5575a09291 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
index 7685525e16..7685525e16 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestBookmarksTables.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
index ea68fde323..ea68fde323 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestCHPBinTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
index 0a33bab46a..0a33bab46a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestDocumentProperties.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
index b35a8d3c01..b35a8d3c01 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFileInformationBlock.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
index dcda989a01..dcda989a01 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestFontTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
index b04b17b897..b04b17b897 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestListTables.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
index 3aff17d62a..3aff17d62a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestNotesTables.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
index b65843ab63..b65843ab63 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPAPBinTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
index 23a4c28777..23a4c28777 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlexOfCps.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlfLfo.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java
index a18902ad8d..a18902ad8d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestPlfLfo.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
index 9ffebae0cd..9ffebae0cd 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
index 0ae2e4a87a..0ae2e4a87a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSavedByTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
index 63ab183e75..63ab183e75 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestSectionTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
index dfffa2c4b8..dfffa2c4b8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestStyleSheet.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
index 9150631f67..9150631f67 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/TestTextPieceTable.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
index aa986a558f..aa986a558f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
index d48fa9e4f5..d48fa9e4f5 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
index e403786fbe..e403786fbe 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
index 65c5dac5a8..65c5dac5a8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
index 8c998ebd62..8c998ebd62 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBorderCode.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
index a886141f2f..a886141f2f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
index f0e17acf76..f0e17acf76 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
index 5028a85e6b..5028a85e6b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug49820.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
index 12b70fb446..12b70fb446 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug50075.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
index be98329282..be98329282 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBugs.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
index c34b31982e..c34b31982e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
index 3f0f8b7ce0..3f0f8b7ce0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
index 72f0c86df0..72f0c86df0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
index 28fb2a6568..28fb2a6568 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestLists.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
index c8974d4d15..c8974d4d15 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
index 61e4ced097..61e4ced097 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
index 9732b77bda..9732b77bda 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestProblems.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
index 7d6c72fc6e..7d6c72fc6e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRange.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
index 1b49b3883f..1b49b3883f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
index e8a9259460..e8a9259460 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
index 21514bd246..21514bd246 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
index 2cecbe8bd6..2cecbe8bd6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
index 32898c2b8e..32898c2b8e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
index 84f1009afa..84f1009afa 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestTableRow.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java b/scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
index 5ff823779c..5ff823779c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
+++ b/scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
diff --git a/src/multimodule/scratchpad/test9/module-info.class b/scratchpad/src/test/java9/module-info.class
index 480bdd61e3..480bdd61e3 100644
--- a/src/multimodule/scratchpad/test9/module-info.class
+++ b/scratchpad/src/test/java9/module-info.class
diff --git a/src/multimodule/scratchpad/test9/module-info.java b/scratchpad/src/test/java9/module-info.java
index aa1e3d76c8..aa1e3d76c8 100644
--- a/src/multimodule/scratchpad/test9/module-info.java
+++ b/scratchpad/src/test/java9/module-info.java
diff --git a/settings.gradle b/settings.gradle
index de9c7e7cb8..c1b5e71952 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,3 @@
 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')
+include 'main', 'ooxml-schema', 'ooxml', 'excelant', 'examples', 'scratchpad', 'integrationtest'
\ No newline at end of file
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 3c28c7989b..7dceeabfa2 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -31,7 +31,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/excelant/java</directory>
+                                    <directory>../../excelant/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -47,10 +47,10 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/excelant/resources</directory>
+                                    <directory>../../excelant/src/main/resources</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/resources/test</directory>
+                                    <directory>../../excelant/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -66,7 +66,7 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/excelant/testcases</directory>
+                                    <directory>../../excelant/src/test/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/integration-test/pom.xml b/sonar/integration-test/pom.xml
index d1baa067e4..01e75d9b9b 100644
--- a/sonar/integration-test/pom.xml
+++ b/sonar/integration-test/pom.xml
@@ -7,6 +7,7 @@
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
         <version>5.0.1-SNAPSHOT</version>
+
     </parent>
     <artifactId>integration-test</artifactId>
     <packaging>jar</packaging>
@@ -18,7 +19,7 @@
             <!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-<!--                <version>${mavnen.plugin.resources.version}</version>-->
+                <version>${maven.plugin.resources.version}</version>
                 <executions>
                     <execution>
                         <id>copy-tests</id>
@@ -30,10 +31,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/integrationtest</directory>
+                                    <directory>../../integrationtest/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/testcases</directory>
+                                    <directory>../../main/src/test/java</directory>
                                     <includes>
                                         <include>org/apache/poi/POIDataSamples.java</include>
                                         <include>org/apache/poi/util/NullPrintStream.java</include>
@@ -42,7 +43,7 @@
                                     </includes>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/resources/integrationtest</directory>
+                                    <directory>../../integrationtest/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 0d99970519..3383554035 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -30,7 +30,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/java</directory>
+                                    <directory>../../main/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -45,7 +45,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/resources/main</directory>
+                                    <directory>../../main/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -61,10 +61,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/testcases</directory>
+                                    <directory>../../main/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/resources/test</directory>
+                                    <directory>../../main/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/ooxml-full/pom.xml b/sonar/ooxml-full/pom.xml
index 09b111f0ed..263136d962 100644
--- a/sonar/ooxml-full/pom.xml
+++ b/sonar/ooxml-full/pom.xml
@@ -34,7 +34,7 @@
                         </goals>
                         <configuration>
                             <target>
-                                <property name="xsdir" value="${basedir}/../../src/ooxml/resources/org/apache/poi"/>
+                                <property name="xsdir" value="${basedir}/../../ooxml-schema/src/main/xmlschema/org/apache/poi"/>
                                 <copy todir="${basedir}/target/schemas">
                                     <zipfileset src="${xsdir}/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
                                     <zipfileset src="${xsdir}/schemas/OpenPackagingConventions-XMLSchema.zip" includes="opc-digSig.xsd,opc-relationships.xsd"/>
@@ -80,11 +80,6 @@
                         <argument>${basedir}/target/generated-sources</argument>
                         <argument>${basedir}/target/schemas</argument>
                     </arguments>
-                    <additionalClasspathElements>
-                        <additionalClasspathElement>
-                            ${basedir}/../../lib/ooxml/xmlbeans-4.0.0.jar
-                        </additionalClasspathElement>
-                    </additionalClasspathElements>
                 </configuration>
             </plugin>
 
@@ -105,7 +100,7 @@
                                     <directory>${basedir}/target/generated-resources</directory>
                                 </resource>
                                 <resource>
-                                    <directory>${basedir}/../../src/multimodule/ooxml-full/java9</directory>
+                                    <directory>${basedir}/../../ooxml-schema/src/ooxml-full/java9</directory>
                                     <targetPath>META-INF/versions/9</targetPath>
                                     <includes>
                                         <include>*.class</include>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index dc9a77b415..e181ca3171 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -28,7 +28,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/ooxml/java</directory>
+                                    <directory>../../ooxml/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -43,7 +43,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/resources/ooxml</directory>
+                                    <directory>../../ooxml/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -58,10 +58,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/ooxml/testcases</directory>
+                                    <directory>../../ooxml/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/resources/test</directory>
+                                    <directory>../../ooxml/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index c79dc66f81..639d930358 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -17,7 +17,7 @@
         <!-- 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>
@@ -37,7 +37,7 @@
                             <outputDirectory>${basedir}/src/main/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/scratchpad/src</directory>
+                                    <directory>../../scratchpad/src/main/java</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -53,7 +53,7 @@
                             <outputDirectory>${basedir}/src/main/resources</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/resources/scratchpad</directory>
+                                    <directory>../../scratchpad/src/main/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -69,10 +69,10 @@
                             <outputDirectory>${basedir}/src/test/java</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../../src/scratchpad/testcases</directory>
+                                    <directory>../../scratchpad/src/test/java</directory>
                                 </resource>
                                 <resource>
-                                    <directory>../../src/resources/test</directory>
+                                    <directory>../../scratchpad/src/test/resources</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -91,7 +91,7 @@
                         </fileset>
                     </filesets>
                 </configuration>
-            </plugin>			
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/contrib/testcases/dummy.txt b/src/contrib/testcases/dummy.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/src/contrib/testcases/dummy.txt
+++ /dev/null
diff --git a/src/examples/lib/dummy.txt b/src/examples/lib/dummy.txt
deleted file mode 100644
index ee37f45196..0000000000
--- a/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/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class
deleted file mode 100644
index 6c12f9f957..0000000000
--- a/src/multimodule/ooxml-lite/java9/module-info.class
+++ /dev/null
diff --git a/src/records/definitions/area_format_record.xml b/src/records/definitions/area_format_record.xml
deleted file mode 100644
index 3fc2a9c189..0000000000
--- a/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/src/records/definitions/area_record.xml b/src/records/definitions/area_record.xml
deleted file mode 100644
index 16f04e15f2..0000000000
--- a/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/src/records/definitions/attached_label_record.xml b/src/records/definitions/attached_label_record.xml
deleted file mode 100644
index e2e59e8e8b..0000000000
--- a/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/src/records/definitions/axes_used_record.xml b/src/records/definitions/axes_used_record.xml
deleted file mode 100644
index cd8cf1065f..0000000000
--- a/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/src/records/definitions/axis_line_format_record.xml b/src/records/definitions/axis_line_format_record.xml
deleted file mode 100644
index ff0fc4d392..0000000000
--- a/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/src/records/definitions/axis_options_record.xml b/src/records/definitions/axis_options_record.xml
deleted file mode 100644
index 0100f6e1a1..0000000000
--- a/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/src/records/definitions/axis_parent_record.xml b/src/records/definitions/axis_parent_record.xml
deleted file mode 100644
index 22532a81cd..0000000000
--- a/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/src/records/definitions/axis_record.xml b/src/records/definitions/axis_record.xml
deleted file mode 100644
index b03c23f777..0000000000
--- a/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/src/records/definitions/bar_record.xml b/src/records/definitions/bar_record.xml
deleted file mode 100644
index 9fffd79fa7..0000000000
--- a/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/src/records/definitions/category_series_axis_record.xml b/src/records/definitions/category_series_axis_record.xml
deleted file mode 100644
index 94088b5a79..0000000000
--- a/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/src/records/definitions/chart_record.xml b/src/records/definitions/chart_record.xml
deleted file mode 100644
index f1bd8fc9d9..0000000000
--- a/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/src/records/definitions/common_object_data_record.xml b/src/records/definitions/common_object_data_record.xml
deleted file mode 100644
index ad7ebfd183..0000000000
--- a/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/src/records/definitions/dat_record.xml b/src/records/definitions/dat_record.xml
deleted file mode 100644
index bda909ea5a..0000000000
--- a/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/src/records/definitions/dataformat_record.xml b/src/records/definitions/dataformat_record.xml
deleted file mode 100644
index 3720e24ff8..0000000000
--- a/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/src/records/definitions/default_data_label_text_properties_record.xml b/src/records/definitions/default_data_label_text_properties_record.xml
deleted file mode 100644
index 9a0e755bd5..0000000000
--- a/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/src/records/definitions/font_basis_record.xml b/src/records/definitions/font_basis_record.xml
deleted file mode 100644
index e16b292fe8..0000000000
--- a/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/src/records/definitions/font_example.xml b/src/records/definitions/font_example.xml
deleted file mode 100644
index 9bf54470a6..0000000000
--- a/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/src/records/definitions/font_index_record.xml b/src/records/definitions/font_index_record.xml
deleted file mode 100644
index bac26e2cb9..0000000000
--- a/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/src/records/definitions/frame_record.xml b/src/records/definitions/frame_record.xml
deleted file mode 100644
index b3b033998c..0000000000
--- a/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/src/records/definitions/legend_record.xml b/src/records/definitions/legend_record.xml
deleted file mode 100644
index 577443e960..0000000000
--- a/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/src/records/definitions/line_format_record.xml b/src/records/definitions/line_format_record.xml
deleted file mode 100644
index f55679fcef..0000000000
--- a/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/src/records/definitions/linked_data_record.xml b/src/records/definitions/linked_data_record.xml
deleted file mode 100644
index bd247bd63e..0000000000
--- a/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/src/records/definitions/number_format_index_record.xml b/src/records/definitions/number_format_index_record.xml
deleted file mode 100644
index 08d5f5c7fa..0000000000
--- a/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/src/records/definitions/object_link_record.xml b/src/records/definitions/object_link_record.xml
deleted file mode 100644
index 03848bb8f2..0000000000
--- a/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/src/records/definitions/pane_record.xml b/src/records/definitions/pane_record.xml
deleted file mode 100644
index 436443113a..0000000000
--- a/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/src/records/definitions/plotgrowth_record.xml b/src/records/definitions/plotgrowth_record.xml
deleted file mode 100644
index 469b9816b4..0000000000
--- a/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/src/records/definitions/scl_record.xml b/src/records/definitions/scl_record.xml
deleted file mode 100644
index abe21b15ba..0000000000
--- a/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/src/records/definitions/series_chart_group_record.xml b/src/records/definitions/series_chart_group_record.xml
deleted file mode 100644
index 84338f144f..0000000000
--- a/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/src/records/definitions/series_index_record.xml b/src/records/definitions/series_index_record.xml
deleted file mode 100644
index a35e019252..0000000000
--- a/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/src/records/definitions/series_record.xml b/src/records/definitions/series_record.xml
deleted file mode 100644
index e6d516410d..0000000000
--- a/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/src/records/definitions/series_text_record.xml b/src/records/definitions/series_text_record.xml
deleted file mode 100644
index f86aa2da87..0000000000
--- a/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/src/records/definitions/sertocrt_record.xml b/src/records/definitions/sertocrt_record.xml
deleted file mode 100644
index a904e96c85..0000000000
--- a/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/src/records/definitions/sheet_properties_record.xml b/src/records/definitions/sheet_properties_record.xml
deleted file mode 100644
index 97c5300e76..0000000000
--- a/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/src/records/definitions/subrecord.xsl b/src/records/definitions/subrecord.xsl
deleted file mode 100644
index 01016bc6b2..0000000000
--- a/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/src/records/definitions/subrecord_test.xsl b/src/records/definitions/subrecord_test.xsl
deleted file mode 100644
index c729b41309..0000000000
--- a/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/src/records/definitions/text_record.xml b/src/records/definitions/text_record.xml
deleted file mode 100644
index c486a7fd9e..0000000000
--- a/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/src/records/definitions/textobject_record.xml b/src/records/definitions/textobject_record.xml
deleted file mode 100644
index 8e7e6e83ca..0000000000
--- a/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/src/records/definitions/tick_record.xml b/src/records/definitions/tick_record.xml
deleted file mode 100644
index d1f704a7c8..0000000000
--- a/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/src/records/definitions/value_range_record.xml b/src/records/definitions/value_range_record.xml
deleted file mode 100644
index c5be1d8192..0000000000
--- a/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/src/records/styles/record.xsl b/src/records/styles/record.xsl
deleted file mode 100644
index dae346b5dc..0000000000
--- a/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/src/records/styles/record_document.xsl b/src/records/styles/record_document.xsl
deleted file mode 100644
index 7895c661ba..0000000000
--- a/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/src/records/styles/record_test.xsl b/src/records/styles/record_test.xsl
deleted file mode 100644
index a70a9491b7..0000000000
--- a/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/src/scratchpad/testcases/dummy.txt b/src/scratchpad/testcases/dummy.txt
deleted file mode 100644
index e69de29bb2..0000000000
--- a/src/scratchpad/testcases/dummy.txt
+++ /dev/null
diff --git a/src/types/definitions/FFData_type.xml b/src/types/definitions/FFData_type.xml
deleted file mode 100644
index 2016adb6dd..0000000000
--- a/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/src/types/definitions/FibBase_type.xml b/src/types/definitions/FibBase_type.xml
deleted file mode 100644
index 37c81a4466..0000000000
--- a/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/src/types/definitions/FibRgLw95_type.xml b/src/types/definitions/FibRgLw95_type.xml
deleted file mode 100644
index 74c5dc53a4..0000000000
--- a/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/src/types/definitions/FibRgLw97_type.xml b/src/types/definitions/FibRgLw97_type.xml
deleted file mode 100644
index 0fafcc9c81..0000000000
--- a/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/src/types/definitions/FibRgW97_type.xml b/src/types/definitions/FibRgW97_type.xml
deleted file mode 100644
index 7f902d2f3e..0000000000
--- a/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/src/types/definitions/LFOLVLBase_type.xml b/src/types/definitions/LFOLVLBase_type.xml
deleted file mode 100644
index 1cafd752d8..0000000000
--- a/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/src/types/definitions/StdfBase_type.xml b/src/types/definitions/StdfBase_type.xml
deleted file mode 100644
index 5b9918ffef..0000000000
--- a/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/src/types/definitions/StdfPost2000_type.xml b/src/types/definitions/StdfPost2000_type.xml
deleted file mode 100644
index 277962f08e..0000000000
--- a/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/src/types/definitions/Stshif_type.xml b/src/types/definitions/Stshif_type.xml
deleted file mode 100644
index cab40209ff..0000000000
--- a/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/src/types/definitions/bkf_type.xml b/src/types/definitions/bkf_type.xml
deleted file mode 100644
index 32a4b1ca23..0000000000
--- a/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/src/types/definitions/chp_type.xml b/src/types/definitions/chp_type.xml
deleted file mode 100644
index 5d77786e1d..0000000000
--- a/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/src/types/definitions/dml-shapeGeometry.xjb b/src/types/definitions/dml-shapeGeometry.xjb
deleted file mode 100644
index 8d05c62914..0000000000
--- a/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/src/types/definitions/dop_type.xml b/src/types/definitions/dop_type.xml
deleted file mode 100644
index 77de331bf6..0000000000
--- a/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/src/types/definitions/fld_type.xml b/src/types/definitions/fld_type.xml
deleted file mode 100644
index 2c7a0b945d..0000000000
--- a/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/src/types/definitions/frd_type.xml b/src/types/definitions/frd_type.xml
deleted file mode 100644
index a447413434..0000000000
--- a/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/src/types/definitions/fspa_type.xml b/src/types/definitions/fspa_type.xml
deleted file mode 100644
index 42e464aa5a..0000000000
--- a/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/src/types/definitions/grfhic_type.xml b/src/types/definitions/grfhic_type.xml
deleted file mode 100644
index 0c1cf5c7c5..0000000000
--- a/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/src/types/definitions/hresi_type.xml b/src/types/definitions/hresi_type.xml
deleted file mode 100644
index aef96bdf67..0000000000
--- a/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/src/types/definitions/lfo_type.xml b/src/types/definitions/lfo_type.xml
deleted file mode 100644
index 911f6ce6f1..0000000000
--- a/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/src/types/definitions/lstf_type.xml b/src/types/definitions/lstf_type.xml
deleted file mode 100644
index 5c7f1d334f..0000000000
--- a/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/src/types/definitions/lvlf_type.xml b/src/types/definitions/lvlf_type.xml
deleted file mode 100644
index c60a4f1b3f..0000000000
--- a/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/src/types/definitions/pap_type.xml b/src/types/definitions/pap_type.xml
deleted file mode 100644
index 710425a4ed..0000000000
--- a/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/src/types/definitions/picf_type.xml b/src/types/definitions/picf_type.xml
deleted file mode 100644
index cdda965020..0000000000
--- a/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/src/types/definitions/sep_type.xml b/src/types/definitions/sep_type.xml
deleted file mode 100644
index ff0689bde2..0000000000
--- a/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/src/types/definitions/shd80_type.xml b/src/types/definitions/shd80_type.xml
deleted file mode 100644
index 22210ce7b0..0000000000
--- a/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/src/types/definitions/shd_type.xml b/src/types/definitions/shd_type.xml
deleted file mode 100644
index a2c1ba6247..0000000000
--- a/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/src/types/definitions/tap_type.xml b/src/types/definitions/tap_type.xml
deleted file mode 100644
index 2a56ddc5e6..0000000000
--- a/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/src/types/definitions/tbd_type.xml b/src/types/definitions/tbd_type.xml
deleted file mode 100644
index 7faeb01bf7..0000000000
--- a/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/src/types/definitions/tc_type.xml b/src/types/definitions/tc_type.xml
deleted file mode 100644
index 7df82bd658..0000000000
--- a/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/src/types/definitions/tlp_type.xml b/src/types/definitions/tlp_type.xml
deleted file mode 100644
index b915e6e9b4..0000000000
--- a/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/src/types/styles/hdftype.xsl b/src/types/styles/hdftype.xsl
deleted file mode 100644
index d8c90e7523..0000000000
--- a/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/src/types/styles/hdftype_document.xsl b/src/types/styles/hdftype_document.xsl
deleted file mode 100644
index f7bfb720cd..0000000000
--- a/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/src/types/styles/hdftype_test.xsl b/src/types/styles/hdftype_test.xsl
deleted file mode 100644
index d95c81bb3b..0000000000
--- a/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>