diff options
author | Sergey Vladimirov <sergey@apache.org> | 2012-09-11 19:49:44 +0000 |
---|---|---|
committer | Sergey Vladimirov <sergey@apache.org> | 2012-09-11 19:49:44 +0000 |
commit | 861bccdf3c31ad9fae6e235ba96910823d3c28e8 (patch) | |
tree | cb9e2b92e5213bd01fa176970aaf026281f68e2d /src/types | |
parent | a0ad9be37d61f5c11fe0bb49e824dfdd8127e4ed (diff) | |
download | poi-861bccdf3c31ad9fae6e235ba96910823d3c28e8.tar.gz poi-861bccdf3c31ad9fae6e235ba96910823d3c28e8.zip |
Fixed bug 53380 -- ArrayIndexOutOfBounds Excetion parsing word 97 document
We had incorrect implementation for sprmCShd80 (0x4866) 0x66 processing, Shd was used instead of Shd80
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1383584 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/types')
-rw-r--r-- | src/types/definitions/shd80_type.xml | 14 | ||||
-rw-r--r-- | src/types/definitions/shd_type.xml | 13 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/types/definitions/shd80_type.xml b/src/types/definitions/shd80_type.xml index ab3b45e4f4..22210ce7b0 100644 --- a/src/types/definitions/shd80_type.xml +++ b/src/types/definitions/shd80_type.xml @@ -19,17 +19,17 @@ --> <record fromfile="true" name="SHD80" package="org.apache.poi.hwpf.model.types"> <suffix>AbstractType</suffix> - <description>The SHD80 is a substructure of the CHP and PAP, and TC for Word 97. <p>Class - and fields descriptions are quoted from - Microsoft Office Word 97-2007 Binary File Format + <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. <p>Class and fields + descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation </description> - <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] + <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="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> diff --git a/src/types/definitions/shd_type.xml b/src/types/definitions/shd_type.xml index 940eaa99ab..a2c1ba6247 100644 --- a/src/types/definitions/shd_type.xml +++ b/src/types/definitions/shd_type.xml @@ -19,16 +19,15 @@ --> <record fromfile="true" name="SHD" package="org.apache.poi.hwpf.model.types"> <suffix>AbstractType</suffix> - <description>The SHD is a substructure of the CHP, PAP, and TC for Word 2000. <p>Class + <description>The Shd structure specifies the colors and pattern that are used for background shading. <p>Class and - fields descriptions are quoted from Microsoft Office Word 97-2007 Binary File Format + fields descriptions are quoted from Word (.doc) Binary File Format by Microsoft Corporation </description> - <author>Sergey Vladimirov; according to Microsoft Office Word 97-2007 Binary File Format - Specification [*.doc] + <author>Sergey Vladimirov; according to Word (.doc) Binary File Format by Microsoft Corporation. </author> <fields> - <field type="Colorref" size="4" name="cvFore" description="24-bit foreground color"/> - <field type="Colorref" size="4" name="cvBack" description="24-bit background color"/> - <field type="int" size="2" name="ipat" description="Shading pattern"/> + <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> |