From 18f04f5b5c0660e5b1a7671c2fbea80475dfd53c Mon Sep 17 00:00:00 2001 From: Rainer Klute Date: Tue, 31 Aug 2004 20:46:41 +0000 Subject: [PATCH] - Adjusting the variant type moved to Property. git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353595 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/poi/hpsf/VariantSupport.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/src/java/org/apache/poi/hpsf/VariantSupport.java index 95ff2e469..7b4719a4f 100644 --- a/src/java/org/apache/poi/hpsf/VariantSupport.java +++ b/src/java/org/apache/poi/hpsf/VariantSupport.java @@ -320,14 +320,8 @@ public class VariantSupport extends Variant final Object value, final int codepage) throws IOException, WritingNotSupportedException { - long lType = type; - - /* Ensure that wide strings are written if the codepage is Unicode. */ - if (codepage == Constants.CP_UNICODE && type == Variant.VT_LPSTR) - lType = Variant.VT_LPWSTR; - int length = 0; - switch ((int) lType) + switch ((int) type) { case Variant.VT_BOOL: { @@ -419,10 +413,10 @@ public class VariantSupport extends Variant out.write(b); length = b.length; writeUnsupportedTypeMessage - (new WritingNotSupportedException(lType, value)); + (new WritingNotSupportedException(type, value)); } else - throw new WritingNotSupportedException(lType, value); + throw new WritingNotSupportedException(type, value); break; } }