Refactor `AcroForm::traverseField` to improve field handling logic: streamline c…

…hecks, replace manual key access with `FormNode` methods, and enhance maintainability.

Refactor `AcroForm::traverseField` to improve field handling logic: streamline c…
…hecks, replace manual key access with `FormNode` methods, and enhance maintainability.
m-holger
1 parent 66e41e3e
Showing 1 changed file with 7 additions and 4 deletions
libqpdf/QPDFAcroFormDocumentHelper.cc
@@ -432,7 +432,11 @@ AcroForm::traverseField(QPDFObjectHandle field, QPDFObjectHandle const&amp; parent, 
         annotation_to_field_[og] = QPDFFormFieldObjectHelper(our_field);
     }
-    if (is_field && depth != 0 && field["/Parent"] != parent) {
+    if (!is_field) {
+        return true;
+    }
+
+    if (depth != 0 && field["/Parent"] != parent) {
         for (auto const& kid: Array(field["/Parent"]["/Kids"])) {
             if (kid == field) {
                 field.warn("while traversing /AcroForm found field with two parents");
@@ -449,14 +453,13 @@ AcroForm::traverseField(QPDFObjectHandle field, QPDFObjectHandle const&amp; parent, 
         field.replaceKey("/Parent", parent);
     }
-    if (is_field && field.hasKey("/T")) {
-        QPDFFormFieldObjectHelper foh(field);
-        std::string name = foh.getFullyQualifiedName();
+    if (node.T()) {
         auto old = fields_.find(og);
         if (old != fields_.end() && !old->second.name.empty()) {
             // We might be updating after a name change, so remove any old information
             name_to_fields_[old->second.name].erase(og);
         }
+        std::string name = node.fully_qualified_name();
         fields_[og].name = name;
         name_to_fields_[name].insert(og);
     }