fix VT_LPWSTR support

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1178149 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/src/java/org/apache/poi/hpsf/VariantSupport.java
index ecb486b94bafb822a6e5967a86fbfb6169ed6e9f..f1752de8a061733df1ae617dabfbaaa9cf4ceb9a 100644 (file)
--- a/src/java/org/apache/poi/hpsf/VariantSupport.java
+++ b/src/java/org/apache/poi/hpsf/VariantSupport.java
@@ -505,19 +505,23 @@ public class VariantSupport extends Variant
             }
             case Variant.VT_LPWSTR:
             {
-                final int nrOfChars = ((String) value).length() + 1;
-                length += TypeWriter.writeUIntToStream(out, nrOfChars);
-                char[] s = Util.pad4((String) value);
-                for (int i = 0; i < s.length; i++)
+                final int nrOfChars = ( (String) value ).length() + 1;
+                length += TypeWriter.writeUIntToStream( out, nrOfChars );
+                char[] s = ( (String) value ).toCharArray();
+                for ( int i = 0; i < s.length; i++ )
                 {
-                    final int high = ((s[i] & 0x0000ff00) >> 8);
-                    final int low = (s[i] & 0x000000ff);
+                    final int high = ( ( s[i] & 0x0000ff00 ) >> 8 );
+                    final int low = ( s[i] & 0x000000ff );
                     final byte highb = (byte) high;
                     final byte lowb = (byte) low;
-                    out.write(lowb);
-                    out.write(highb);
+                    out.write( lowb );
+                    out.write( highb );
                     length += 2;
                 }
+                // NullTerminator
+                out.write( 0x00 );
+                out.write( 0x00 );
+                length += 2;
                 break;
             }
             case Variant.VT_CF: