Merge branch 'hotfix/unicodeformfield' into develop

Author: Benoit Lagae

forms/src/main/java/com/itextpdf/forms/PdfAcroForm.java

@@ -845,10 +845,10 @@ private Map<String, PdfFormField> iterateFields(PdfArray array, Map<String, PdfF
                         parentField = PdfFormField.makeFormField(parentField.getParent(), document);
                     }
                 }
-                name = fieldName.toUnicodeString() + "." + index;
+                name = fieldName.getValue() + "." + index;
                 index++;
             } else {
-                name = fieldName.toUnicodeString();
+                name = fieldName.getValue();
             }
             fields.put(name, formField);
             if (formField.getKids() != null) {

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -1214,12 +1214,12 @@ public PdfString getFieldName() {
             PdfFormField parentField = PdfFormField.makeFormField(getParent(), getDocument());
             PdfString pName = parentField.getFieldName();
             if (pName != null) {
-                parentName = pName.toUnicodeString() + ".";
+                parentName = pName.getValue() + ".";
             }
         }
         PdfString name = getPdfObject().getAsString(PdfName.T);
         if (name != null) {
-            name = new PdfString(parentName + name.toUnicodeString());
+            name = new PdfString(parentName + name.getValue());
         }
         return name;
     }

forms/src/test/java/com/itextpdf/forms/PdfFormFieldTest.java

@@ -130,6 +130,16 @@ public void formFieldTest03() throws IOException, InterruptedException {
         }
     }
 
+    @Test
+    public void unicodeFormFieldTest() throws IOException {
+        String filename = sourceFolder + "unicodeFormFieldFile.pdf";
+        PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+        PdfAcroForm form = PdfAcroForm.getAcroForm(pdfDoc, true);
+        Map<String, PdfFormField> formFields = form.getFormFields();
+        byte[] result = {(byte) 0xFE,(byte) 0xFF,(byte) 0x5E,(byte) 0x10,(byte) 0x53,(byte) 0xF7,(byte) 0x00,(byte) 0x31}; // 帐号1: account number 1
+        Assert.assertArrayEquals(formFields.keySet().toArray()[0].toString().getBytes(), result);
+    }
+
     @Test
     public void choiceFieldTest01() throws IOException, InterruptedException {
         String filename = destinationFolder + "choiceFieldTest01.pdf";