1 files changed, 13 insertions, 26 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
index 48547d7e9f..9e85c1f539 100644
--- a/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
+++ b/xfa/src/fxfa/src/parser/xfa_parser_imp.cpp
@@ -386,12 +386,12 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
           pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PACKET_XDP)->pName,
           XFA_GetPacketByIndex(XFA_PACKET_XDP)->pURI,
           XFA_GetPacketByIndex(XFA_PACKET_XDP)->eFlags)) {
-    return nullptr;
+    return NULL;
   }
   CXFA_Node* pXFARootNode =
       m_pFactory->CreateNode(XFA_XDPPACKET_XDP, XFA_ELEMENT_Xfa);
   if (!pXFARootNode) {
-    return nullptr;
+    return NULL;
   }
   m_pRootNode = pXFARootNode;
   pXFARootNode->SetCData(XFA_ATTRIBUTE_Name, FX_WSTRC(L"xfa"));
@@ -408,8 +408,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
       }
     }
   }
-  IFDE_XMLNode* pXMLConfigDOMRoot = nullptr;
-  CXFA_Node* pXFAConfigDOMRoot = nullptr;
+  IFDE_XMLNode* pXMLConfigDOMRoot = NULL;
+  CXFA_Node* pXFAConfigDOMRoot = NULL;
   {
     for (IFDE_XMLNode* pChildItem =
              pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild);
@@ -423,7 +423,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
       }
       if (CXFA_Node* pChildNode =
               pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) {
-        return nullptr;
+        return NULL;
       }
       pXMLConfigDOMRoot = pChildItem;
       pXFAConfigDOMRoot =
@@ -431,9 +431,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
       pXFARootNode->InsertChild(pXFAConfigDOMRoot, NULL);
     }
   }
-  IFDE_XMLNode* pXMLDatasetsDOMRoot = nullptr;
-  IFDE_XMLNode* pXMLFormDOMRoot = nullptr;
-  IFDE_XMLNode* pXMLTemplateDOMRoot = nullptr;
+  IFDE_XMLNode* pXMLDatasetsDOMRoot = NULL;
+  IFDE_XMLNode* pXMLFormDOMRoot = NULL;
   {
     for (IFDE_XMLNode* pChildItem =
              pXMLDocumentNode->GetNodeItem(IFDE_XMLNode::FirstChild);
@@ -454,7 +453,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
         if (!XFA_FDEExtension_MatchNodeName(pElement, pPacketInfo->pName,
                                             pPacketInfo->pURI,
                                             pPacketInfo->eFlags)) {
-          pPacketInfo = nullptr;
+          pPacketInfo = NULL;
         }
       }
       XFA_XDPPACKET ePacket =
@@ -464,41 +463,29 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
       }
       if (ePacket == XFA_XDPPACKET_Datasets) {
         if (pXMLDatasetsDOMRoot) {
-          return nullptr;
+          pXMLDatasetsDOMRoot = NULL;
+          return NULL;
         }
         pXMLDatasetsDOMRoot = pElement;
       } else if (ePacket == XFA_XDPPACKET_Form) {
         if (pXMLFormDOMRoot) {
-          return nullptr;
+          pXMLFormDOMRoot = NULL;
+          return NULL;
         }
         pXMLFormDOMRoot = pElement;
-      } else if (ePacket == XFA_XDPPACKET_Template) {
-        if (pXMLTemplateDOMRoot) {
-          // Found a duplicate template packet.
-          return nullptr;
-        }
-        CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket);
-        if (pPacketNode) {
-          pXMLTemplateDOMRoot = pElement;
-          pXFARootNode->InsertChild(pPacketNode);
-        }
       } else {
         CXFA_Node* pPacketNode = ParseAsXDPPacket(pElement, ePacket);
         if (pPacketNode) {
           if (pPacketInfo &&
               (pPacketInfo->eFlags & XFA_XDPPACKET_FLAGS_SUPPORTONE) &&
               pXFARootNode->GetFirstChildByName(pPacketInfo->uHash)) {
-            return nullptr;
+            return NULL;
           }
           pXFARootNode->InsertChild(pPacketNode);
         }
       }
     }
   }
-  if (!pXMLTemplateDOMRoot) {
-    // No template is found.
-    return nullptr;
-  }
   if (pXMLDatasetsDOMRoot) {
     CXFA_Node* pPacketNode =
         ParseAsXDPPacket(pXMLDatasetsDOMRoot, XFA_XDPPACKET_Datasets);