From 26c0e71d744515fc38aabd6a2bb768b8655c2cd7 Mon Sep 17 00:00:00 2001
From: Jason Height <jheight@apache.org>
Date: Tue, 17 Jan 2006 09:08:23 +0000
Subject: [PATCH] BUG 38230 Fixed. Confirmed that the typecast from byte to
 char caused errors. Added testcase.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@369729 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hssf/record/RecordInputStream.java    |  5 ++-
 .../apache/poi/hssf/record/UnicodeString.java | 10 +++---
 .../hssf/usermodel/TestUnicodeWorkbook.java   | 36 +++++++++++++++++++
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/java/org/apache/poi/hssf/record/RecordInputStream.java b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
index 17c98763a4..00c9200d5b 100755
--- a/src/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ b/src/java/org/apache/poi/hssf/record/RecordInputStream.java
@@ -249,7 +249,10 @@ public class RecordInputStream extends InputStream
     for (int i=0;i<length;i++) {
       if ((remaining() == 0) && (isContinueNext()))
         nextRecord();
-      char ch = (char)readByte();
+      byte b = readByte();
+      //Typecast direct to char from byte with high bit set causes all ones
+      //in the high byte of the char (which is of course incorrect)
+      char ch = (char)( (short)0xff & (short)b );
       buf.append(ch); 
     }
     return buf.toString();    
diff --git a/src/java/org/apache/poi/hssf/record/UnicodeString.java b/src/java/org/apache/poi/hssf/record/UnicodeString.java
index e9e0afd7a2..ac05276a86 100644
--- a/src/java/org/apache/poi/hssf/record/UnicodeString.java
+++ b/src/java/org/apache/poi/hssf/record/UnicodeString.java
@@ -230,19 +230,21 @@ public class UnicodeString
         in.setAutoContinue(false);
         StringBuffer tmpString = new StringBuffer(field_1_charCount);
         int stringCharCount = field_1_charCount;
-        boolean isUncompressed = ((field_2_optionflags & 1) == 0);
+        boolean isCompressed = ((field_2_optionflags & 1) == 0);
         while (stringCharCount != 0) {
           if (in.remaining() == 0) {
             if (in.isContinueNext()) {
               in.nextRecord();
               //Check if we are now reading, compressed or uncompressed unicode.
               byte optionflags = in.readByte();
-              isUncompressed = ((optionflags & 1) == 0);
+              isCompressed = ((optionflags & 1) == 0);
             } else
               throw new RecordFormatException("Expected continue record.");
           }
-          if (isUncompressed) {
-            char ch = (char)in.readByte();
+          if (isCompressed) {
+            //Typecast direct to char from byte with high bit set causes all ones
+            //in the high byte of the char (which is of course incorrect)
+            char ch = (char)( (short)0xff & (short)in.readByte() );
             tmpString.append(ch);
           } else {
             char ch = (char) in.readShort();
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
index 5eda00eff8..eabf78961f 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
@@ -91,5 +91,41 @@ public class TestUnicodeWorkbook extends TestCase {
         c3 = r.getCell((short)3);
         assertEquals(c3.getCellFormula(), formulaString);
     }
+    
+    /** Tests Bug38230
+     *  That a Umlat is written  and then read back.
+     *  It should have been written as a compressed unicode.
+     * 
+     * 
+     *
+     */
+    public void testUmlatReadWrite() throws Exception {
+        HSSFWorkbook wb = new HSSFWorkbook();
+        
+        //Create a unicode sheet name (euro symbol)
+        HSSFSheet s = wb.createSheet("test");
+        
+        HSSFRow r = s.createRow(0);
+        HSSFCell c = r.createCell((short)1);
+        c.setCellValue(new HSSFRichTextString("\u00e4"));
+        
+        //Confirm that the sring will be compressed
+        assertEquals(c.getRichStringCellValue().getUnicodeString().getOptionFlags(), 0);
+        
+        File tempFile = TempFile.createTempFile("umlat", "test.xls");
+        FileOutputStream stream = new FileOutputStream(tempFile);
+        wb.write(stream);
+        
+        wb = null;
+        FileInputStream in = new FileInputStream(tempFile);
+        wb = new HSSFWorkbook(in);
+
+        //Test the sheetname
+        s = wb.getSheet("test");
+        assertNotNull(s);
+        
+        c = r.getCell((short)1);
+        assertEquals(c.getRichStringCellValue().getString(), "\u00e4");
+    }    
 
 }
-- 
2.39.5