Merge branch 'hotfix/unicodeforms' into develop

Autoported commit.
Original commit hash: [f86610438]

Author: Benoit Lagae

itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTest.cs

@@ -121,10 +121,20 @@ public virtual void UnicodeFormFieldTest() {
             PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
             PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
             IDictionary<String, PdfFormField> formFields = form.GetFormFields();
-            byte[] result = new byte[] { (byte)0xFE, (byte)0xFF, (byte)0x5E, (byte)0x10, (byte)0x53, (byte)0xF7, (byte
-                )0x00, (byte)0x31 };
+            String fieldName = "\u5E10\u53F71";
             // 帐号1: account number 1
-            NUnit.Framework.Assert.AreEqual(formFields.Keys.ToArray(new String[1])[0].GetBytes(), result);
+            NUnit.Framework.Assert.AreEqual(fieldName, formFields.Keys.ToArray(new String[1])[0]);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        [NUnit.Framework.Test]
+        public virtual void UnicodeFormFieldTest2() {
+            String filename = sourceFolder + "unicodeFormFieldFile.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            String fieldName = "\u5E10\u53F71";
+            // 帐号1: account number 1
+            NUnit.Framework.Assert.IsNotNull(form.GetField(fieldName));
         }
 
         /// <exception cref="System.IO.IOException"/>

itext/itext.forms/itext/forms/PdfAcroForm.cs

@@ -952,11 +952,11 @@ private IDictionary<String, PdfFormField> IterateFields(PdfArray array, IDiction
                             parentField = PdfFormField.MakeFormField(parentField.GetParent(), document);
                         }
                     }
-                    name = fieldName.GetValue() + "." + index;
+                    name = fieldName.ToUnicodeString() + "." + index;
                     index++;
                 }
                 else {
-                    name = fieldName.GetValue();
+                    name = fieldName.ToUnicodeString();
                 }
                 fields.Put(name, formField);
                 if (formField.GetKids() != null) {

itext/itext.forms/itext/forms/fields/PdfFormField.cs

@@ -1578,12 +1578,12 @@ public virtual PdfString GetFieldName() {
                     ());
                 PdfString pName = parentField.GetFieldName();
                 if (pName != null) {
-                    parentName = pName.GetValue() + ".";
+                    parentName = pName.ToUnicodeString() + ".";
                 }
             }
             PdfString name = GetPdfObject().GetAsString(PdfName.T);
             if (name != null) {
-                name = new PdfString(parentName + name.GetValue());
+                name = new PdfString(parentName + name.ToUnicodeString(), PdfEncodings.UNICODE_BIG);
             }
             return name;
         }

port-hash

@@ -1 +1 @@
-dbab5374686a1d8971a2554aad565ef8bd39e643
+f86610438d1a8c56782300fada2c44af4e6fe747