moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

correctly add padding to 16-bit integers

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1178111 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-10-02 00:55:56 +00:00
parent 04a9868e95
commit 46e1c019cc
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/poi/hpsf/VariantSupport.java
View File

@ -477,11 +477,12 @@ public class VariantSupport extends Variant
case Variant.VT_BOOL: case Variant.VT_BOOL:
{ {
int trueOrFalse; int trueOrFalse;
if (((Boolean) value).booleanValue()) if ( ( (Boolean) value ).booleanValue() )
trueOrFalse = 1; trueOrFalse = 0xFFFF;
else else
trueOrFalse = 0; trueOrFalse = 0x0000;
length = TypeWriter.writeUIntToStream(out, trueOrFalse); TypeWriter.writeUShortToStream( out, trueOrFalse );
length += 2;
break; break;
} }
case Variant.VT_LPSTR: case Variant.VT_LPSTR:
@ -534,7 +535,13 @@ public class VariantSupport extends Variant
case Variant.VT_I2: case Variant.VT_I2:
{ {
TypeWriter.writeToStream(out, ((Integer) value).shortValue()); TypeWriter.writeToStream(out, ((Integer) value).shortValue());
length = LittleEndianConsts.SHORT_SIZE; // length = LittleEndianConsts.SHORT_SIZE;
TypeWriter.writeToStream( out, (short) 0x0000 );
/*
* MUST be a 16-bit signed integer, followed by zero padding to 4
* bytes -- http://msdn.microsoft.com/en-us/library/dd942532(v=PROT.13).aspx
*/
length = LittleEndianConsts.INT_SIZE;
break; break;
} }
case Variant.VT_I4: case Variant.VT_I4: