Create a unique name for each OCProperties. Update some cmps.

DEVSIX-2163

Autoported commit.
Original commit hash: [afc225426]

Author: ars18wrw

itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfLayerTest/cmp_output_layered.pdf

@@ -64,6 +64,33 @@ namespace iText.Kernel.Pdf.Layer {
     public class PdfOCProperties : PdfObjectWrapper<PdfDictionary> {
         private IList<PdfLayer> layers = new List<PdfLayer>();
 
+        /// <summary>
+        /// Gets the order of the layers in which they will be displayed in the layer view panel,
+        /// including nesting.
+        /// </summary>
+        private static void GetOCGOrder(PdfArray order, PdfLayer layer) {
+            if (!layer.IsOnPanel()) {
+                return;
+            }
+            if (layer.GetTitle() == null) {
+                order.Add(layer.GetPdfObject().GetIndirectReference());
+            }
+            IList<PdfLayer> children = layer.GetChildren();
+            if (children == null) {
+                return;
+            }
+            PdfArray kids = new PdfArray();
+            if (layer.GetTitle() != null) {
+                kids.Add(new PdfString(layer.GetTitle(), PdfEncodings.UNICODE_BIG));
+            }
+            foreach (PdfLayer child in children) {
+                GetOCGOrder(kids, child);
+            }
+            if (kids.Size() > 0) {
+                order.Add(kids);
+            }
+        }
+
         /// <summary>Creates a new PdfOCProperties instance.</summary>
         /// <param name="document">the document the optional content belongs to</param>
         public PdfOCProperties(PdfDocument document)
@@ -145,6 +172,7 @@ public virtual PdfObject FillDictionary() {
             if (rbGroups != null) {
                 d.Put(PdfName.RBGroups, rbGroups);
             }
+            d.Put(PdfName.Name, new PdfString(CreateUniqueName(), PdfEncodings.UNICODE_BIG));
             GetPdfObject().Put(PdfName.D, d);
             IList<PdfLayer> docOrder = new List<PdfLayer>(layers);
             for (int i = 0; i < docOrder.Count; i++) {
@@ -193,6 +221,24 @@ public virtual PdfObject FillDictionary() {
             return GetPdfObject();
         }
 
+        private String CreateUniqueName() {
+            int uniqueID = 0;
+            ICollection<String> usedNames = new HashSet<String>();
+            PdfArray configs = GetPdfObject().GetAsArray(PdfName.Configs);
+            if (null != configs) {
+                for (int i = 0; i < configs.Size(); i++) {
+                    PdfDictionary alternateDictionary = configs.GetAsDictionary(i);
+                    if (null != alternateDictionary && alternateDictionary.ContainsKey(PdfName.Name)) {
+                        usedNames.Add(alternateDictionary.GetAsString(PdfName.Name).ToUnicodeString());
+                    }
+                }
+            }
+            while (usedNames.Contains("OCConfigName" + uniqueID)) {
+                uniqueID++;
+            }
+            return "OCConfigName" + uniqueID;
+        }
+
         public override void Flush() {
             FillDictionary();
             base.Flush();
@@ -224,33 +270,6 @@ protected internal virtual PdfDocument GetDocument() {
             return GetPdfObject().GetIndirectReference().GetDocument();
         }
 
-        /// <summary>
-        /// Gets the order of the layers in which they will be displayed in the layer view panel,
-        /// including nesting.
-        /// </summary>
-        private static void GetOCGOrder(PdfArray order, PdfLayer layer) {
-            if (!layer.IsOnPanel()) {
-                return;
-            }
-            if (layer.GetTitle() == null) {
-                order.Add(layer.GetPdfObject().GetIndirectReference());
-            }
-            IList<PdfLayer> children = layer.GetChildren();
-            if (children == null) {
-                return;
-            }
-            PdfArray kids = new PdfArray();
-            if (layer.GetTitle() != null) {
-                kids.Add(new PdfString(layer.GetTitle(), PdfEncodings.UNICODE_BIG));
-            }
-            foreach (PdfLayer child in children) {
-                GetOCGOrder(kids, child);
-            }
-            if (kids.Size() > 0) {
-                order.Add(kids);
-            }
-        }
-
         /// <summary>Populates the /AS entry in the /D dictionary.</summary>
         private void AddASEvent(PdfName @event, PdfName category) {
             PdfArray arr = new PdfArray();

itext.tests/itext.kernel.tests/resources/itext/kernel/pdf/PdfXObjectTest/cmp_documentFromImages1.pdf

@@ -1 +1 @@
-71180b08e7d566226757888776b008557cd50013
+afc225426dbb06cf5a53cc2e0af04a1466f7a6bd