diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-30 21:29:11 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-30 21:29:11 +0000 |
| commit | c40c5aa2d7f1753dd382c35955deafdaca660020 (patch) | |
| tree | b427f5516046d40b8dd63f8c7a552fac0bf278ae | |
| parent | 9daec60824d085db8c2f841fd389c725df1f8b0b (diff) | |
| download | pdfium-c40c5aa2d7f1753dd382c35955deafdaca660020.tar.xz | |
A CXFA_Node can only be in one packet
When a CXFA_Node is created it's created as part of a specific packet.
Previously the code would accept an XFA_XDPPACKET which was stored
internally. This had the potential to allow a node to exist in multiple
packets.
This CL changes the XFA_XDPPacket to the XFA_PacketType enum class and
cleans up a lot of uses to use the more specific packet type.
Change-Id: I7fc8c843bfa6bd32295ae58a26bcec311e43c4b0
Reviewed-on: https://pdfium-review.googlesource.com/20012
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
637 files changed, 782 insertions, 771 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp index cdf89848f8..52cf1d90f2 100644 --- a/fxjs/cjx_node.cpp +++ b/fxjs/cjx_node.cpp @@ -777,7 +777,7 @@ void CJX_Node::Script_NodeClass_LoadXML(CFXJSE_Arguments* pArguments) { pChild = pItem; } - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Form && + if (GetXFANode()->GetPacketType() == XFA_PacketType::Form && GetXFANode()->GetElementType() == XFA_Element::ExData) { CFX_XMLNode* pTempXMLNode = GetXFANode()->GetXMLMappingNode(); GetXFANode()->SetXMLMappingNode(pFakeXMLRoot.release()); @@ -825,14 +825,14 @@ void CJX_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) { // TODO(weili): Check whether we need to save pretty print XML, pdfium:501. WideString bsXMLHeader = L"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - if (GetXFANode()->GetPacketID() != XFA_XDPPACKET_Form && - GetXFANode()->GetPacketID() != XFA_XDPPACKET_Datasets) { + if (GetXFANode()->GetPacketType() != XFA_PacketType::Form && + GetXFANode()->GetPacketType() != XFA_PacketType::Datasets) { pArguments->GetReturnValue()->SetString(""); return; } CFX_XMLNode* pElement = nullptr; - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Datasets) { + if (GetXFANode()->GetPacketType() == XFA_PacketType::Datasets) { pElement = GetXFANode()->GetXMLMappingNode(); if (!pElement || pElement->GetType() != FX_XMLNODE_Element) { pArguments->GetReturnValue()->SetString( @@ -848,7 +848,7 @@ void CJX_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) { pStream->SetCodePage(FX_CODEPAGE_UTF8); pStream->WriteString(bsXMLHeader.AsStringView()); - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Form) + if (GetXFANode()->GetPacketType() == XFA_PacketType::Form) XFA_DataExporter_RegenerateFormFile(GetXFANode(), pStream, nullptr, true); else pElement->SaveXMLNode(pStream); @@ -1053,7 +1053,7 @@ void CJX_Node::SendAttributeChangeMessage(XFA_Attribute eAttribute, if (!pNotify) return; - if (!(GetXFANode()->GetPacketID() & XFA_XDPPACKET_Form)) { + if (GetXFANode()->GetPacketType() != XFA_PacketType::Form) { pNotify->OnValueChanged(GetXFANode(), eAttribute, GetXFANode(), GetXFANode()); return; @@ -1405,7 +1405,7 @@ void CJX_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue, WideString wsFormatValue(wsNewValue); CXFA_WidgetData* pContainerWidgetData = nullptr; - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Datasets) { + if (GetXFANode()->GetPacketType() == XFA_PacketType::Datasets) { WideString wsPicture; for (const auto& pFormNode : *(GetXFANode()->GetBindItems())) { if (!pFormNode || pFormNode->HasRemovedChildren()) @@ -1421,7 +1421,7 @@ void CJX_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue, pContainerWidgetData = nullptr; } - } else if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Form) { + } else if (GetXFANode()->GetPacketType() == XFA_PacketType::Form) { pContainerWidgetData = GetXFANode()->GetContainerWidgetData(); } @@ -2358,7 +2358,7 @@ void CJX_Node::Script_Template_CreateNode(CFXJSE_Arguments* pArguments) { pNewNode->JSNode()->SetAttribute(XFA_Attribute::Name, strName.AsStringView(), true); - if (pNewNode->GetPacketID() == XFA_XDPPACKET_Datasets) + if (pNewNode->GetPacketType() == XFA_PacketType::Datasets) pNewNode->CreateXMLMappingNode(); pArguments->GetReturnValue()->Assign( @@ -3084,7 +3084,7 @@ bool CJX_Node::SetCData(XFA_Attribute eAttr, wsValue); } else { bool bDeleteChildren = true; - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Datasets) { + if (GetXFANode()->GetPacketType() == XFA_PacketType::Datasets) { for (CXFA_Node* pChildDataNode = GetXFANode()->GetNodeItem(XFA_NODEITEM_FirstChild); pChildDataNode; pChildDataNode = pChildDataNode->GetNodeItem( @@ -3142,7 +3142,7 @@ void CJX_Node::SetAttributeValue(const WideString& wsValue, wsXMLValue); } else { bool bDeleteChildren = true; - if (GetXFANode()->GetPacketID() == XFA_XDPPACKET_Datasets) { + if (GetXFANode()->GetPacketType() == XFA_PacketType::Datasets) { for (CXFA_Node* pChildDataNode = GetXFANode()->GetNodeItem(XFA_NODEITEM_FirstChild); pChildDataNode; pChildDataNode = pChildDataNode->GetNodeItem( @@ -3373,7 +3373,7 @@ bool CJX_Node::SetContent(const WideString& wsContent, break; case XFA_ObjectType::NodeV: pNode = GetXFANode(); - if (bSyncData && GetXFANode()->GetPacketID() == XFA_XDPPACKET_Form) { + if (bSyncData && GetXFANode()->GetPacketType() == XFA_PacketType::Form) { CXFA_Node* pParent = GetXFANode()->GetNodeItem(XFA_NODEITEM_Parent); if (pParent) { pParent = pParent->GetNodeItem(XFA_NODEITEM_Parent); @@ -3499,7 +3499,7 @@ pdfium::Optional<WideString> CJX_Node::TryNamespace() { return {static_cast<CFX_XMLElement*>(pXMLNode)->GetNamespaceURI()}; } - if (GetXFANode()->GetPacketID() != XFA_XDPPACKET_Datasets) + if (GetXFANode()->GetPacketType() != XFA_PacketType::Datasets) return GetXFANode()->GetModelNode()->JSNode()->TryNamespace(); CFX_XMLNode* pXMLNode = GetXFANode()->GetXMLMappingNode(); @@ -3550,7 +3550,7 @@ CXFA_Node* CJX_Node::GetProperty(int32_t index, CXFA_Node* pNewNode = nullptr; for (; iCount <= index; ++iCount) { pNewNode = - GetDocument()->CreateNode(GetXFANode()->GetPacketID(), eProperty); + GetDocument()->CreateNode(GetXFANode()->GetPacketType(), eProperty); if (!pNewNode) return nullptr; GetXFANode()->InsertChild(pNewNode, nullptr); @@ -3584,7 +3584,7 @@ bool CJX_Node::GetMapModuleValue(void* pKey, void*& pValue) { return true; } } - if (pNode->GetPacketID() == XFA_XDPPACKET_Datasets) + if (pNode->GetPacketType() == XFA_PacketType::Datasets) break; } return false; @@ -3648,7 +3648,7 @@ bool CJX_Node::GetMapModuleBuffer(void* pKey, break; } } - if (!bProtoAlso || pNode->GetPacketID() == XFA_XDPPACKET_Datasets) + if (!bProtoAlso || pNode->GetPacketType() == XFA_PacketType::Datasets) break; } if (!pBuffer) diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp index 7e66e4e888..fc425c50f9 100644 --- a/xfa/fxfa/cxfa_ffnotify.cpp +++ b/xfa/fxfa/cxfa_ffnotify.cpp @@ -360,7 +360,7 @@ void CXFA_FFNotify::OnNodeReady(CXFA_Node* pNode) { void CXFA_FFNotify::OnValueChanging(CXFA_Node* pSender, XFA_Attribute eAttr) { if (eAttr != XFA_Attribute::Presence) return; - if (pSender->GetPacketID() & XFA_XDPPACKET_Datasets) + if (pSender->GetPacketType() == XFA_PacketType::Datasets) return; if (!pSender->IsFormContainer()) return; @@ -390,7 +390,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender, if (!pDocView) return; - if (!(pSender->GetPacketID() & XFA_XDPPACKET_Form)) { + if (pSender->GetPacketType() != XFA_PacketType::Form) { if (eAttr == XFA_Attribute::Value) pDocView->AddCalculateNodeNotify(pSender); return; diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp index 89fed79ec8..6e142d3c4f 100644 --- a/xfa/fxfa/cxfa_ffwidgethandler.cpp +++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp @@ -503,7 +503,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreateTemplateNode(XFA_Element eElement, CXFA_Node* pBefore) const { CXFA_Document* pXFADoc = GetXFADoc(); CXFA_Node* pNewTemplateNode = - pXFADoc->CreateNode(XFA_XDPPACKET_Template, eElement); + pXFADoc->CreateNode(XFA_PacketType::Template, eElement); if (pParent) pParent->InsertChild(pNewTemplateNode, pBefore); return pNewTemplateNode; diff --git a/xfa/fxfa/fxfa_basic.h b/xfa/fxfa/fxfa_basic.h index 1f79608ff8..f4d3383ae8 100644 --- a/xfa/fxfa/fxfa_basic.h +++ b/xfa/fxfa/fxfa_basic.h @@ -86,9 +86,7 @@ enum XFA_XDPPACKET { XFA_XDPPACKET_Stylesheet = 1 << static_cast<uint8_t>(XFA_PacketType::Stylesheet), XFA_XDPPACKET_USER = 1 << static_cast<uint8_t>(XFA_PacketType::User), - XFA_XDPPACKET_XDP = 1 << static_cast<uint8_t>(XFA_PacketType::Xdp), - - XFA_XDPPACKET_LAST = XFA_XDPPACKET_ConnectionSet + 1 + XFA_XDPPACKET_XDP = 1 << static_cast<uint8_t>(XFA_PacketType::Xdp) }; enum XFA_XDPPACKET_FLAGS { diff --git a/xfa/fxfa/parser/cxfa_accessiblecontent.cpp b/xfa/fxfa/parser/cxfa_accessiblecontent.cpp index f603d208ee..0a24615995 100644 --- a/xfa/fxfa/parser/cxfa_accessiblecontent.cpp +++ b/xfa/fxfa/parser/cxfa_accessiblecontent.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"accessibleContent"; } // namespace CXFA_AccessibleContent::CXFA_AccessibleContent(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_accessiblecontent.h b/xfa/fxfa/parser/cxfa_accessiblecontent.h index 75e7f38f11..84ad8fca52 100644 --- a/xfa/fxfa/parser/cxfa_accessiblecontent.h +++ b/xfa/fxfa/parser/cxfa_accessiblecontent.h @@ -11,7 +11,7 @@ class CXFA_AccessibleContent : public CXFA_Node { public: - CXFA_AccessibleContent(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AccessibleContent(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AccessibleContent() override; }; diff --git a/xfa/fxfa/parser/cxfa_acrobat.cpp b/xfa/fxfa/parser/cxfa_acrobat.cpp index 88f3928a55..2327c0834a 100644 --- a/xfa/fxfa/parser/cxfa_acrobat.cpp +++ b/xfa/fxfa/parser/cxfa_acrobat.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"acrobat"; } // namespace -CXFA_Acrobat::CXFA_Acrobat(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Acrobat::CXFA_Acrobat(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_acrobat.h b/xfa/fxfa/parser/cxfa_acrobat.h index a7f85ebc41..3701d591e7 100644 --- a/xfa/fxfa/parser/cxfa_acrobat.h +++ b/xfa/fxfa/parser/cxfa_acrobat.h @@ -11,7 +11,7 @@ class CXFA_Acrobat : public CXFA_Node { public: - CXFA_Acrobat(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Acrobat(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Acrobat() override; }; diff --git a/xfa/fxfa/parser/cxfa_acrobat7.cpp b/xfa/fxfa/parser/cxfa_acrobat7.cpp index 860cf1d3e1..089ab605fc 100644 --- a/xfa/fxfa/parser/cxfa_acrobat7.cpp +++ b/xfa/fxfa/parser/cxfa_acrobat7.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"acrobat7"; } // namespace -CXFA_Acrobat7::CXFA_Acrobat7(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Acrobat7::CXFA_Acrobat7(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_acrobat7.h b/xfa/fxfa/parser/cxfa_acrobat7.h index e9ef61b8ba..579864ac1b 100644 --- a/xfa/fxfa/parser/cxfa_acrobat7.h +++ b/xfa/fxfa/parser/cxfa_acrobat7.h @@ -11,7 +11,7 @@ class CXFA_Acrobat7 : public CXFA_Node { public: - CXFA_Acrobat7(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Acrobat7(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Acrobat7() override; }; diff --git a/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp b/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp index 1ecca4e95a..af33636383 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp +++ b/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"ADBE_JSConsole"; } // namespace CXFA_aDBE_JSConsole::CXFA_aDBE_JSConsole(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_adbe_jsconsole.h b/xfa/fxfa/parser/cxfa_adbe_jsconsole.h index 40369f4c97..9fab6a11db 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsconsole.h +++ b/xfa/fxfa/parser/cxfa_adbe_jsconsole.h @@ -11,7 +11,7 @@ class CXFA_aDBE_JSConsole : public CXFA_Node { public: - CXFA_aDBE_JSConsole(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_aDBE_JSConsole(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_aDBE_JSConsole() override; }; diff --git a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp index eefcdb0f90..bcb62ebe1d 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp +++ b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"ADBE_JSDebugger"; } // namespace CXFA_aDBE_JSDebugger::CXFA_aDBE_JSDebugger(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.h b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.h index 0c2f122672..ed821d4d0d 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.h +++ b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.h @@ -11,7 +11,7 @@ class CXFA_aDBE_JSDebugger : public CXFA_Node { public: - CXFA_aDBE_JSDebugger(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_aDBE_JSDebugger(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_aDBE_JSDebugger() override; }; diff --git a/xfa/fxfa/parser/cxfa_addsilentprint.cpp b/xfa/fxfa/parser/cxfa_addsilentprint.cpp index 4dc1acf32c..13f7f83e88 100644 --- a/xfa/fxfa/parser/cxfa_addsilentprint.cpp +++ b/xfa/fxfa/parser/cxfa_addsilentprint.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"addSilentPrint"; } // namespace CXFA_AddSilentPrint::CXFA_AddSilentPrint(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_addsilentprint.h b/xfa/fxfa/parser/cxfa_addsilentprint.h index 844a0c1f20..a2519692da 100644 --- a/xfa/fxfa/parser/cxfa_addsilentprint.h +++ b/xfa/fxfa/parser/cxfa_addsilentprint.h @@ -11,7 +11,7 @@ class CXFA_AddSilentPrint : public CXFA_Node { public: - CXFA_AddSilentPrint(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AddSilentPrint(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AddSilentPrint() override; }; diff --git a/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp b/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp index 6cfa024e82..3e3d06056d 100644 --- a/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp +++ b/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"addViewerPreferences"; } // namespace CXFA_AddViewerPreferences::CXFA_AddViewerPreferences(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_addviewerpreferences.h b/xfa/fxfa/parser/cxfa_addviewerpreferences.h index 92d3f81784..cf10868b0c 100644 --- a/xfa/fxfa/parser/cxfa_addviewerpreferences.h +++ b/xfa/fxfa/parser/cxfa_addviewerpreferences.h @@ -11,7 +11,7 @@ class CXFA_AddViewerPreferences : public CXFA_Node { public: - CXFA_AddViewerPreferences(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AddViewerPreferences(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AddViewerPreferences() override; }; diff --git a/xfa/fxfa/parser/cxfa_adjustdata.cpp b/xfa/fxfa/parser/cxfa_adjustdata.cpp index cf58242b0e..60a4f2c5bd 100644 --- a/xfa/fxfa/parser/cxfa_adjustdata.cpp +++ b/xfa/fxfa/parser/cxfa_adjustdata.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"adjustData"; } // namespace -CXFA_AdjustData::CXFA_AdjustData(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_AdjustData::CXFA_AdjustData(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_adjustdata.h b/xfa/fxfa/parser/cxfa_adjustdata.h index 59aced8532..3c004c2a6a 100644 --- a/xfa/fxfa/parser/cxfa_adjustdata.h +++ b/xfa/fxfa/parser/cxfa_adjustdata.h @@ -11,7 +11,7 @@ class CXFA_AdjustData : public CXFA_Node { public: - CXFA_AdjustData(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AdjustData(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AdjustData() override; }; diff --git a/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp b/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp index d03728c662..d253f8b164 100644 --- a/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp +++ b/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"adobeExtensionLevel"; } // namespace CXFA_AdobeExtensionLevel::CXFA_AdobeExtensionLevel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_adobeextensionlevel.h b/xfa/fxfa/parser/cxfa_adobeextensionlevel.h index 0fe4184b78..91a830f251 100644 --- a/xfa/fxfa/parser/cxfa_adobeextensionlevel.h +++ b/xfa/fxfa/parser/cxfa_adobeextensionlevel.h @@ -11,7 +11,7 @@ class CXFA_AdobeExtensionLevel : public CXFA_Node { public: - CXFA_AdobeExtensionLevel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AdobeExtensionLevel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AdobeExtensionLevel() override; }; diff --git a/xfa/fxfa/parser/cxfa_agent.cpp b/xfa/fxfa/parser/cxfa_agent.cpp index 3dcd75ecff..468b93895f 100644 --- a/xfa/fxfa/parser/cxfa_agent.cpp +++ b/xfa/fxfa/parser/cxfa_agent.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"agent"; } // namespace -CXFA_Agent::CXFA_Agent(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Agent::CXFA_Agent(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_agent.h b/xfa/fxfa/parser/cxfa_agent.h index a7b244b83d..65d826d0ce 100644 --- a/xfa/fxfa/parser/cxfa_agent.h +++ b/xfa/fxfa/parser/cxfa_agent.h @@ -11,7 +11,7 @@ class CXFA_Agent : public CXFA_Node { public: - CXFA_Agent(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Agent(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Agent() override; }; diff --git a/xfa/fxfa/parser/cxfa_alwaysembed.cpp b/xfa/fxfa/parser/cxfa_alwaysembed.cpp index 0138a9b88e..13f97177b9 100644 --- a/xfa/fxfa/parser/cxfa_alwaysembed.cpp +++ b/xfa/fxfa/parser/cxfa_alwaysembed.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"alwaysEmbed"; } // namespace -CXFA_AlwaysEmbed::CXFA_AlwaysEmbed(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_AlwaysEmbed::CXFA_AlwaysEmbed(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_alwaysembed.h b/xfa/fxfa/parser/cxfa_alwaysembed.h index 865f2a0e6b..178097647b 100644 --- a/xfa/fxfa/parser/cxfa_alwaysembed.h +++ b/xfa/fxfa/parser/cxfa_alwaysembed.h @@ -11,7 +11,7 @@ class CXFA_AlwaysEmbed : public CXFA_Node { public: - CXFA_AlwaysEmbed(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AlwaysEmbed(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AlwaysEmbed() override; }; diff --git a/xfa/fxfa/parser/cxfa_amd.cpp b/xfa/fxfa/parser/cxfa_amd.cpp index b174c1a8bd..7580304d58 100644 --- a/xfa/fxfa/parser/cxfa_amd.cpp +++ b/xfa/fxfa/parser/cxfa_amd.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"amd"; } // namespace -CXFA_Amd::CXFA_Amd(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Amd::CXFA_Amd(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_amd.h b/xfa/fxfa/parser/cxfa_amd.h index bf5ece80a8..951c6ca186 100644 --- a/xfa/fxfa/parser/cxfa_amd.h +++ b/xfa/fxfa/parser/cxfa_amd.h @@ -11,7 +11,7 @@ class CXFA_Amd : public CXFA_Node { public: - CXFA_Amd(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Amd(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Amd() override; }; diff --git a/xfa/fxfa/parser/cxfa_appearancefilter.cpp b/xfa/fxfa/parser/cxfa_appearancefilter.cpp index eb8b449dba..eca2a92fff 100644 --- a/xfa/fxfa/parser/cxfa_appearancefilter.cpp +++ b/xfa/fxfa/parser/cxfa_appearancefilter.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"appearanceFilter"; } // namespace CXFA_AppearanceFilter::CXFA_AppearanceFilter(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_appearancefilter.h b/xfa/fxfa/parser/cxfa_appearancefilter.h index e495809c0e..341232ef28 100644 --- a/xfa/fxfa/parser/cxfa_appearancefilter.h +++ b/xfa/fxfa/parser/cxfa_appearancefilter.h @@ -11,7 +11,7 @@ class CXFA_AppearanceFilter : public CXFA_Node { public: - CXFA_AppearanceFilter(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AppearanceFilter(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AppearanceFilter() override; }; diff --git a/xfa/fxfa/parser/cxfa_arc.cpp b/xfa/fxfa/parser/cxfa_arc.cpp index 3465420166..2af650e630 100644 --- a/xfa/fxfa/parser/cxfa_arc.cpp +++ b/xfa/fxfa/parser/cxfa_arc.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"arc"; } // namespace -CXFA_Arc::CXFA_Arc(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Arc::CXFA_Arc(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_arc.h b/xfa/fxfa/parser/cxfa_arc.h index 6127784396..6e838f802a 100644 --- a/xfa/fxfa/parser/cxfa_arc.h +++ b/xfa/fxfa/parser/cxfa_arc.h @@ -11,7 +11,7 @@ class CXFA_Arc : public CXFA_Node { public: - CXFA_Arc(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Arc(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Arc() override; }; diff --git a/xfa/fxfa/parser/cxfa_area.cpp b/xfa/fxfa/parser/cxfa_area.cpp index d3007fbf67..c242e317f1 100644 --- a/xfa/fxfa/parser/cxfa_area.cpp +++ b/xfa/fxfa/parser/cxfa_area.cpp @@ -28,7 +28,7 @@ constexpr wchar_t kName[] = L"area"; } // namespace -CXFA_Area::CXFA_Area(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Area::CXFA_Area(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_area.h b/xfa/fxfa/parser/cxfa_area.h index c1875800f2..6568e73530 100644 --- a/xfa/fxfa/parser/cxfa_area.h +++ b/xfa/fxfa/parser/cxfa_area.h @@ -11,7 +11,7 @@ class CXFA_Area : public CXFA_Node { public: - CXFA_Area(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Area(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Area() override; }; diff --git a/xfa/fxfa/parser/cxfa_assist.cpp b/xfa/fxfa/parser/cxfa_assist.cpp index fbf42c2f05..93f335831a 100644 --- a/xfa/fxfa/parser/cxfa_assist.cpp +++ b/xfa/fxfa/parser/cxfa_assist.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"assist"; } // namespace -CXFA_Assist::CXFA_Assist(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Assist::CXFA_Assist(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_assist.h b/xfa/fxfa/parser/cxfa_assist.h index 642a501f8e..d0e9020a7e 100644 --- a/xfa/fxfa/parser/cxfa_assist.h +++ b/xfa/fxfa/parser/cxfa_assist.h @@ -11,7 +11,7 @@ class CXFA_Assist : public CXFA_Node { public: - CXFA_Assist(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Assist(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Assist() override; }; diff --git a/xfa/fxfa/parser/cxfa_attributes.cpp b/xfa/fxfa/parser/cxfa_attributes.cpp index e9406ef0e8..80e58bd694 100644 --- a/xfa/fxfa/parser/cxfa_attributes.cpp +++ b/xfa/fxfa/parser/cxfa_attributes.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"attributes"; } // namespace -CXFA_Attributes::CXFA_Attributes(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Attributes::CXFA_Attributes(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_attributes.h b/xfa/fxfa/parser/cxfa_attributes.h index 8441d75e81..fd73da87cf 100644 --- a/xfa/fxfa/parser/cxfa_attributes.h +++ b/xfa/fxfa/parser/cxfa_attributes.h @@ -11,7 +11,7 @@ class CXFA_Attributes : public CXFA_Node { public: - CXFA_Attributes(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Attributes(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Attributes() override; }; diff --git a/xfa/fxfa/parser/cxfa_autosave.cpp b/xfa/fxfa/parser/cxfa_autosave.cpp index 1ab6eb9298..d77c25210d 100644 --- a/xfa/fxfa/parser/cxfa_autosave.cpp +++ b/xfa/fxfa/parser/cxfa_autosave.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"autoSave"; } // namespace -CXFA_AutoSave::CXFA_AutoSave(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_AutoSave::CXFA_AutoSave(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_autosave.h b/xfa/fxfa/parser/cxfa_autosave.h index 208917f1c7..b58ccf14a5 100644 --- a/xfa/fxfa/parser/cxfa_autosave.h +++ b/xfa/fxfa/parser/cxfa_autosave.h @@ -11,7 +11,7 @@ class CXFA_AutoSave : public CXFA_Node { public: - CXFA_AutoSave(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_AutoSave(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_AutoSave() override; }; diff --git a/xfa/fxfa/parser/cxfa_barcode.cpp b/xfa/fxfa/parser/cxfa_barcode.cpp index f81e6caa13..357270c94b 100644 --- a/xfa/fxfa/parser/cxfa_barcode.cpp +++ b/xfa/fxfa/parser/cxfa_barcode.cpp @@ -40,7 +40,7 @@ constexpr wchar_t kName[] = L"barcode"; } // namespace -CXFA_Barcode::CXFA_Barcode(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Barcode::CXFA_Barcode(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_barcode.h b/xfa/fxfa/parser/cxfa_barcode.h index 78a27f3563..469889b99d 100644 --- a/xfa/fxfa/parser/cxfa_barcode.h +++ b/xfa/fxfa/parser/cxfa_barcode.h @@ -11,7 +11,7 @@ class CXFA_Barcode : public CXFA_Node { public: - CXFA_Barcode(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Barcode(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Barcode() override; }; diff --git a/xfa/fxfa/parser/cxfa_base.cpp b/xfa/fxfa/parser/cxfa_base.cpp index 106049b610..a82a79a095 100644 --- a/xfa/fxfa/parser/cxfa_base.cpp +++ b/xfa/fxfa/parser/cxfa_base.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"base"; } // namespace -CXFA_Base::CXFA_Base(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Base::CXFA_Base(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_base.h b/xfa/fxfa/parser/cxfa_base.h index e92bd7979e..3974343a15 100644 --- a/xfa/fxfa/parser/cxfa_base.h +++ b/xfa/fxfa/parser/cxfa_base.h @@ -11,7 +11,7 @@ class CXFA_Base : public CXFA_Node { public: - CXFA_Base(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Base(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Base() override; }; diff --git a/xfa/fxfa/parser/cxfa_batchoutput.cpp b/xfa/fxfa/parser/cxfa_batchoutput.cpp index e11a6d7cf7..64c2ccefcb 100644 --- a/xfa/fxfa/parser/cxfa_batchoutput.cpp +++ b/xfa/fxfa/parser/cxfa_batchoutput.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"batchOutput"; } // namespace -CXFA_BatchOutput::CXFA_BatchOutput(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_BatchOutput::CXFA_BatchOutput(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_batchoutput.h b/xfa/fxfa/parser/cxfa_batchoutput.h index f06332a9c8..9faa6cfcca 100644 --- a/xfa/fxfa/parser/cxfa_batchoutput.h +++ b/xfa/fxfa/parser/cxfa_batchoutput.h @@ -11,7 +11,7 @@ class CXFA_BatchOutput : public CXFA_Node { public: - CXFA_BatchOutput(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_BatchOutput(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_BatchOutput() override; }; diff --git a/xfa/fxfa/parser/cxfa_behavioroverride.cpp b/xfa/fxfa/parser/cxfa_behavioroverride.cpp index 6ae3a3d05b..addf8f1327 100644 --- a/xfa/fxfa/parser/cxfa_behavioroverride.cpp +++ b/xfa/fxfa/parser/cxfa_behavioroverride.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"behaviorOverride"; } // namespace CXFA_BehaviorOverride::CXFA_BehaviorOverride(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_behavioroverride.h b/xfa/fxfa/parser/cxfa_behavioroverride.h index fa9f54a5f6..cb08211211 100644 --- a/xfa/fxfa/parser/cxfa_behavioroverride.h +++ b/xfa/fxfa/parser/cxfa_behavioroverride.h @@ -11,7 +11,7 @@ class CXFA_BehaviorOverride : public CXFA_Node { public: - CXFA_BehaviorOverride(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_BehaviorOverride(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_BehaviorOverride() override; }; diff --git a/xfa/fxfa/parser/cxfa_bind.cpp b/xfa/fxfa/parser/cxfa_bind.cpp index d188010789..e3f61dae7d 100644 --- a/xfa/fxfa/parser/cxfa_bind.cpp +++ b/xfa/fxfa/parser/cxfa_bind.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"bind"; } // namespace -CXFA_Bind::CXFA_Bind(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Bind::CXFA_Bind(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_bind.h b/xfa/fxfa/parser/cxfa_bind.h index 961adc734e..9c457bb536 100644 --- a/xfa/fxfa/parser/cxfa_bind.h +++ b/xfa/fxfa/parser/cxfa_bind.h @@ -11,7 +11,7 @@ class CXFA_Bind : public CXFA_Node { public: - CXFA_Bind(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Bind(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Bind() override; }; diff --git a/xfa/fxfa/parser/cxfa_binditems.cpp b/xfa/fxfa/parser/cxfa_binditems.cpp index f7e7eace67..fd27043d6c 100644 --- a/xfa/fxfa/parser/cxfa_binditems.cpp +++ b/xfa/fxfa/parser/cxfa_binditems.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"bindItems"; } // namespace -CXFA_BindItems::CXFA_BindItems(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_BindItems::CXFA_BindItems(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_binditems.h b/xfa/fxfa/parser/cxfa_binditems.h index 4c31be182e..f2263429b1 100644 --- a/xfa/fxfa/parser/cxfa_binditems.h +++ b/xfa/fxfa/parser/cxfa_binditems.h @@ -11,7 +11,7 @@ class CXFA_BindItems : public CXFA_Node { public: - CXFA_BindItems(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_BindItems(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_BindItems() override; }; diff --git a/xfa/fxfa/parser/cxfa_bookend.cpp b/xfa/fxfa/parser/cxfa_bookend.cpp index a057595c7b..20037f070a 100644 --- a/xfa/fxfa/parser/cxfa_bookend.cpp +++ b/xfa/fxfa/parser/cxfa_bookend.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"bookend"; } // namespace -CXFA_Bookend::CXFA_Bookend(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Bookend::CXFA_Bookend(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_bookend.h b/xfa/fxfa/parser/cxfa_bookend.h index 51308e0930..82eb13c767 100644 --- a/xfa/fxfa/parser/cxfa_bookend.h +++ b/xfa/fxfa/parser/cxfa_bookend.h @@ -11,7 +11,7 @@ class CXFA_Bookend : public CXFA_Node { public: - CXFA_Bookend(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Bookend(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Bookend() override; }; diff --git a/xfa/fxfa/parser/cxfa_boolean.cpp b/xfa/fxfa/parser/cxfa_boolean.cpp index 0d49c98179..74fe2bea74 100644 --- a/xfa/fxfa/parser/cxfa_boolean.cpp +++ b/xfa/fxfa/parser/cxfa_boolean.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"boolean"; } // namespace -CXFA_Boolean::CXFA_Boolean(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Boolean::CXFA_Boolean(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_boolean.h b/xfa/fxfa/parser/cxfa_boolean.h index a43d870831..4121e36409 100644 --- a/xfa/fxfa/parser/cxfa_boolean.h +++ b/xfa/fxfa/parser/cxfa_boolean.h @@ -11,7 +11,7 @@ class CXFA_Boolean : public CXFA_Node { public: - CXFA_Boolean(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Boolean(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Boolean() override; }; diff --git a/xfa/fxfa/parser/cxfa_border.cpp b/xfa/fxfa/parser/cxfa_border.cpp index d2a2afa89f..fe58a93ec8 100644 --- a/xfa/fxfa/parser/cxfa_border.cpp +++ b/xfa/fxfa/parser/cxfa_border.cpp @@ -29,7 +29,7 @@ constexpr wchar_t kName[] = L"border"; } // namespace -CXFA_Border::CXFA_Border(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Border::CXFA_Border(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_border.h b/xfa/fxfa/parser/cxfa_border.h index 050dd16f0c..041999bb3e 100644 --- a/xfa/fxfa/parser/cxfa_border.h +++ b/xfa/fxfa/parser/cxfa_border.h @@ -11,7 +11,7 @@ class CXFA_Border : public CXFA_Node { public: - CXFA_Border(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Border(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Border() override; }; diff --git a/xfa/fxfa/parser/cxfa_break.cpp b/xfa/fxfa/parser/cxfa_break.cpp index 7bbd3a8d80..7d820f9c8a 100644 --- a/xfa/fxfa/parser/cxfa_break.cpp +++ b/xfa/fxfa/parser/cxfa_break.cpp @@ -32,7 +32,7 @@ constexpr wchar_t kName[] = L"break"; } // namespace -CXFA_Break::CXFA_Break(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Break::CXFA_Break(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_break.h b/xfa/fxfa/parser/cxfa_break.h index 25aa8c1733..c0d937c513 100644 --- a/xfa/fxfa/parser/cxfa_break.h +++ b/xfa/fxfa/parser/cxfa_break.h @@ -11,7 +11,7 @@ class CXFA_Break : public CXFA_Node { public: - CXFA_Break(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Break(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Break() override; }; diff --git a/xfa/fxfa/parser/cxfa_breakafter.cpp b/xfa/fxfa/parser/cxfa_breakafter.cpp index 46d244cd90..e80a5725ac 100644 --- a/xfa/fxfa/parser/cxfa_breakafter.cpp +++ b/xfa/fxfa/parser/cxfa_breakafter.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"breakAfter"; } // namespace -CXFA_BreakAfter::CXFA_BreakAfter(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_BreakAfter::CXFA_BreakAfter(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_breakafter.h b/xfa/fxfa/parser/cxfa_breakafter.h index 242bf9f8bb..952b0c9a99 100644 --- a/xfa/fxfa/parser/cxfa_breakafter.h +++ b/xfa/fxfa/parser/cxfa_breakafter.h @@ -11,7 +11,7 @@ class CXFA_BreakAfter : public CXFA_Node { public: - CXFA_BreakAfter(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_BreakAfter(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_BreakAfter() override; }; diff --git a/xfa/fxfa/parser/cxfa_breakbefore.cpp b/xfa/fxfa/parser/cxfa_breakbefore.cpp index 5b712f7976..94d9130b2c 100644 --- a/xfa/fxfa/parser/cxfa_breakbefore.cpp +++ b/xfa/fxfa/parser/cxfa_breakbefore.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"breakBefore"; } // namespace -CXFA_BreakBefore::CXFA_BreakBefore(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_BreakBefore::CXFA_BreakBefore(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_breakbefore.h b/xfa/fxfa/parser/cxfa_breakbefore.h index 76078f061c..358e477993 100644 --- a/xfa/fxfa/parser/cxfa_breakbefore.h +++ b/xfa/fxfa/parser/cxfa_breakbefore.h @@ -11,7 +11,7 @@ class CXFA_BreakBefore : public CXFA_Node { public: - CXFA_BreakBefore(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_BreakBefore(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_BreakBefore() override; }; diff --git a/xfa/fxfa/parser/cxfa_button.cpp b/xfa/fxfa/parser/cxfa_button.cpp index 0191a94306..245f00e205 100644 --- a/xfa/fxfa/parser/cxfa_button.cpp +++ b/xfa/fxfa/parser/cxfa_button.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"button"; } // namespace -CXFA_Button::CXFA_Button(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Button::CXFA_Button(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_button.h b/xfa/fxfa/parser/cxfa_button.h index dbf9102690..86ffb52c52 100644 --- a/xfa/fxfa/parser/cxfa_button.h +++ b/xfa/fxfa/parser/cxfa_button.h @@ -11,7 +11,7 @@ class CXFA_Button : public CXFA_Node { public: - CXFA_Button(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Button(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Button() override; }; diff --git a/xfa/fxfa/parser/cxfa_cache.cpp b/xfa/fxfa/parser/cxfa_cache.cpp index 55cbaf94c6..74227a3000 100644 --- a/xfa/fxfa/parser/cxfa_cache.cpp +++ b/xfa/fxfa/parser/cxfa_cache.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"cache"; } // namespace -CXFA_Cache::CXFA_Cache(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Cache::CXFA_Cache(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_cache.h b/xfa/fxfa/parser/cxfa_cache.h index 2e4ca124e4..e3907c68e7 100644 --- a/xfa/fxfa/parser/cxfa_cache.h +++ b/xfa/fxfa/parser/cxfa_cache.h @@ -11,7 +11,7 @@ class CXFA_Cache : public CXFA_Node { public: - CXFA_Cache(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Cache(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Cache() override; }; diff --git a/xfa/fxfa/parser/cxfa_calculate.cpp b/xfa/fxfa/parser/cxfa_calculate.cpp index a4a1d040b9..44c060ff84 100644 --- a/xfa/fxfa/parser/cxfa_calculate.cpp +++ b/xfa/fxfa/parser/cxfa_calculate.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"calculate"; } // namespace -CXFA_Calculate::CXFA_Calculate(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Calculate::CXFA_Calculate(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_calculate.h b/xfa/fxfa/parser/cxfa_calculate.h index 9853c23890..01fe853d4b 100644 --- a/xfa/fxfa/parser/cxfa_calculate.h +++ b/xfa/fxfa/parser/cxfa_calculate.h @@ -11,7 +11,7 @@ class CXFA_Calculate : public CXFA_Node { public: - CXFA_Calculate(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Calculate(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Calculate() override; }; diff --git a/xfa/fxfa/parser/cxfa_calendarsymbols.cpp b/xfa/fxfa/parser/cxfa_calendarsymbols.cpp index 0fb8b621fa..810349fb23 100644 --- a/xfa/fxfa/parser/cxfa_calendarsymbols.cpp +++ b/xfa/fxfa/parser/cxfa_calendarsymbols.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"calendarSymbols"; } // namespace CXFA_CalendarSymbols::CXFA_CalendarSymbols(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_calendarsymbols.h b/xfa/fxfa/parser/cxfa_calendarsymbols.h index c12bdb0a97..1b1f007469 100644 --- a/xfa/fxfa/parser/cxfa_calendarsymbols.h +++ b/xfa/fxfa/parser/cxfa_calendarsymbols.h @@ -11,7 +11,7 @@ class CXFA_CalendarSymbols : public CXFA_Node { public: - CXFA_CalendarSymbols(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CalendarSymbols(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CalendarSymbols() override; }; diff --git a/xfa/fxfa/parser/cxfa_caption.cpp b/xfa/fxfa/parser/cxfa_caption.cpp index 7998cf338d..cfd61c0b3b 100644 --- a/xfa/fxfa/parser/cxfa_caption.cpp +++ b/xfa/fxfa/parser/cxfa_caption.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"caption"; } // namespace -CXFA_Caption::CXFA_Caption(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Caption::CXFA_Caption(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_caption.h b/xfa/fxfa/parser/cxfa_caption.h index 3b3b8b59cd..8d6ce13fb9 100644 --- a/xfa/fxfa/parser/cxfa_caption.h +++ b/xfa/fxfa/parser/cxfa_caption.h @@ -11,7 +11,7 @@ class CXFA_Caption : public CXFA_Node { public: - CXFA_Caption(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Caption(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Caption() override; }; diff --git a/xfa/fxfa/parser/cxfa_certificate.cpp b/xfa/fxfa/parser/cxfa_certificate.cpp index e7ccffc925..d512bf36b9 100644 --- a/xfa/fxfa/parser/cxfa_certificate.cpp +++ b/xfa/fxfa/parser/cxfa_certificate.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"certificate"; } // namespace -CXFA_Certificate::CXFA_Certificate(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Certificate::CXFA_Certificate(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_certificate.h b/xfa/fxfa/parser/cxfa_certificate.h index 7e0ffbebc1..48106dac03 100644 --- a/xfa/fxfa/parser/cxfa_certificate.h +++ b/xfa/fxfa/parser/cxfa_certificate.h @@ -11,7 +11,7 @@ class CXFA_Certificate : public CXFA_Node { public: - CXFA_Certificate(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Certificate(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Certificate() override; }; diff --git a/xfa/fxfa/parser/cxfa_certificates.cpp b/xfa/fxfa/parser/cxfa_certificates.cpp index 16a77ce254..3ad45374ef 100644 --- a/xfa/fxfa/parser/cxfa_certificates.cpp +++ b/xfa/fxfa/parser/cxfa_certificates.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"certificates"; } // namespace -CXFA_Certificates::CXFA_Certificates(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Certificates::CXFA_Certificates(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_certificates.h b/xfa/fxfa/parser/cxfa_certificates.h index dc262393a4..a1bed73ff9 100644 --- a/xfa/fxfa/parser/cxfa_certificates.h +++ b/xfa/fxfa/parser/cxfa_certificates.h @@ -11,7 +11,7 @@ class CXFA_Certificates : public CXFA_Node { public: - CXFA_Certificates(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Certificates(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Certificates() override; }; diff --git a/xfa/fxfa/parser/cxfa_change.cpp b/xfa/fxfa/parser/cxfa_change.cpp index c8bee056a5..520c556f33 100644 --- a/xfa/fxfa/parser/cxfa_change.cpp +++ b/xfa/fxfa/parser/cxfa_change.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"change"; } // namespace -CXFA_Change::CXFA_Change(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Change::CXFA_Change(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_change.h b/xfa/fxfa/parser/cxfa_change.h index a332e85dbf..f39b92eacb 100644 --- a/xfa/fxfa/parser/cxfa_change.h +++ b/xfa/fxfa/parser/cxfa_change.h @@ -11,7 +11,7 @@ class CXFA_Change : public CXFA_Node { public: - CXFA_Change(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Change(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Change() override; }; diff --git a/xfa/fxfa/parser/cxfa_checkbutton.cpp b/xfa/fxfa/parser/cxfa_checkbutton.cpp index 6260e45915..b9d0689c71 100644 --- a/xfa/fxfa/parser/cxfa_checkbutton.cpp +++ b/xfa/fxfa/parser/cxfa_checkbutton.cpp @@ -28,7 +28,7 @@ constexpr wchar_t kName[] = L"checkButton"; } // namespace -CXFA_CheckButton::CXFA_CheckButton(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_CheckButton::CXFA_CheckButton(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_checkbutton.h b/xfa/fxfa/parser/cxfa_checkbutton.h index d81de78e51..dbfb4bb5d8 100644 --- a/xfa/fxfa/parser/cxfa_checkbutton.h +++ b/xfa/fxfa/parser/cxfa_checkbutton.h @@ -11,7 +11,7 @@ class CXFA_CheckButton : public CXFA_Node { public: - CXFA_CheckButton(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CheckButton(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CheckButton() override; }; diff --git a/xfa/fxfa/parser/cxfa_choicelist.cpp b/xfa/fxfa/parser/cxfa_choicelist.cpp index a8e88ea2fa..89eb8fa32f 100644 --- a/xfa/fxfa/parser/cxfa_choicelist.cpp +++ b/xfa/fxfa/parser/cxfa_choicelist.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"choiceList"; } // namespace -CXFA_ChoiceList::CXFA_ChoiceList(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ChoiceList::CXFA_ChoiceList(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_choicelist.h b/xfa/fxfa/parser/cxfa_choicelist.h index 8d96070aba..9e948807a2 100644 --- a/xfa/fxfa/parser/cxfa_choicelist.h +++ b/xfa/fxfa/parser/cxfa_choicelist.h @@ -11,7 +11,7 @@ class CXFA_ChoiceList : public CXFA_Node { public: - CXFA_ChoiceList(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ChoiceList(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ChoiceList() override; }; diff --git a/xfa/fxfa/parser/cxfa_color.cpp b/xfa/fxfa/parser/cxfa_color.cpp index 524621860e..9211af7924 100644 --- a/xfa/fxfa/parser/cxfa_color.cpp +++ b/xfa/fxfa/parser/cxfa_color.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"color"; } // namespace -CXFA_Color::CXFA_Color(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Color::CXFA_Color(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_color.h b/xfa/fxfa/parser/cxfa_color.h index 88b2e3bf98..590bcc61da 100644 --- a/xfa/fxfa/parser/cxfa_color.h +++ b/xfa/fxfa/parser/cxfa_color.h @@ -11,7 +11,7 @@ class CXFA_Color : public CXFA_Node { public: - CXFA_Color(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Color(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Color() override; }; diff --git a/xfa/fxfa/parser/cxfa_comb.cpp b/xfa/fxfa/parser/cxfa_comb.cpp index de28a7affb..af3567d0a1 100644 --- a/xfa/fxfa/parser/cxfa_comb.cpp +++ b/xfa/fxfa/parser/cxfa_comb.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"comb"; } // namespace -CXFA_Comb::CXFA_Comb(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Comb::CXFA_Comb(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_comb.h b/xfa/fxfa/parser/cxfa_comb.h index f08bbdd03c..1f2b538c28 100644 --- a/xfa/fxfa/parser/cxfa_comb.h +++ b/xfa/fxfa/parser/cxfa_comb.h @@ -11,7 +11,7 @@ class CXFA_Comb : public CXFA_Node { public: - CXFA_Comb(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Comb(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Comb() override; }; diff --git a/xfa/fxfa/parser/cxfa_command.cpp b/xfa/fxfa/parser/cxfa_command.cpp index 7f03dddbaa..3ed2316ea6 100644 --- a/xfa/fxfa/parser/cxfa_command.cpp +++ b/xfa/fxfa/parser/cxfa_command.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"command"; } // namespace -CXFA_Command::CXFA_Command(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Command::CXFA_Command(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_command.h b/xfa/fxfa/parser/cxfa_command.h index a5942673bf..88b74f3bb5 100644 --- a/xfa/fxfa/parser/cxfa_command.h +++ b/xfa/fxfa/parser/cxfa_command.h @@ -11,7 +11,7 @@ class CXFA_Command : public CXFA_Node { public: - CXFA_Command(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Command(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Command() override; }; diff --git a/xfa/fxfa/parser/cxfa_common.cpp b/xfa/fxfa/parser/cxfa_common.cpp index bf25b9dc1a..e95f02f48a 100644 --- a/xfa/fxfa/parser/cxfa_common.cpp +++ b/xfa/fxfa/parser/cxfa_common.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"common"; } // namespace -CXFA_Common::CXFA_Common(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Common::CXFA_Common(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_common.h b/xfa/fxfa/parser/cxfa_common.h index 51c3398709..d0ce0eae04 100644 --- a/xfa/fxfa/parser/cxfa_common.h +++ b/xfa/fxfa/parser/cxfa_common.h @@ -11,7 +11,7 @@ class CXFA_Common : public CXFA_Node { public: - CXFA_Common(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Common(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Common() override; }; diff --git a/xfa/fxfa/parser/cxfa_compress.cpp b/xfa/fxfa/parser/cxfa_compress.cpp index 54eb10c7e1..5658b2061e 100644 --- a/xfa/fxfa/parser/cxfa_compress.cpp +++ b/xfa/fxfa/parser/cxfa_compress.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"compress"; } // namespace -CXFA_Compress::CXFA_Compress(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Compress::CXFA_Compress(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_compress.h b/xfa/fxfa/parser/cxfa_compress.h index 6a0243fa51..bec18830a2 100644 --- a/xfa/fxfa/parser/cxfa_compress.h +++ b/xfa/fxfa/parser/cxfa_compress.h @@ -11,7 +11,7 @@ class CXFA_Compress : public CXFA_Node { public: - CXFA_Compress(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Compress(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Compress() override; }; diff --git a/xfa/fxfa/parser/cxfa_compression.cpp b/xfa/fxfa/parser/cxfa_compression.cpp index 1efbc55899..3d2bfde1b9 100644 --- a/xfa/fxfa/parser/cxfa_compression.cpp +++ b/xfa/fxfa/parser/cxfa_compression.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"compression"; } // namespace -CXFA_Compression::CXFA_Compression(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Compression::CXFA_Compression(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_compression.h b/xfa/fxfa/parser/cxfa_compression.h index 03b6f07357..f0e26cb5e2 100644 --- a/xfa/fxfa/parser/cxfa_compression.h +++ b/xfa/fxfa/parser/cxfa_compression.h @@ -11,7 +11,7 @@ class CXFA_Compression : public CXFA_Node { public: - CXFA_Compression(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Compression(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Compression() override; }; diff --git a/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp b/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp index e2798ffb7c..a9c2baf21c 100644 --- a/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp +++ b/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"compressLogicalStructure"; CXFA_CompressLogicalStructure::CXFA_CompressLogicalStructure( CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_compresslogicalstructure.h b/xfa/fxfa/parser/cxfa_compresslogicalstructure.h index 01f9df7487..a8b50681cd 100644 --- a/xfa/fxfa/parser/cxfa_compresslogicalstructure.h +++ b/xfa/fxfa/parser/cxfa_compresslogicalstructure.h @@ -11,7 +11,7 @@ class CXFA_CompressLogicalStructure : public CXFA_Node { public: - CXFA_CompressLogicalStructure(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CompressLogicalStructure(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CompressLogicalStructure() override; }; diff --git a/xfa/fxfa/parser/cxfa_compressobjectstream.cpp b/xfa/fxfa/parser/cxfa_compressobjectstream.cpp index e42b7a77e2..49eaed00d7 100644 --- a/xfa/fxfa/parser/cxfa_compressobjectstream.cpp +++ b/xfa/fxfa/parser/cxfa_compressobjectstream.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"compressObjectStream"; } // namespace CXFA_CompressObjectStream::CXFA_CompressObjectStream(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_compressobjectstream.h b/xfa/fxfa/parser/cxfa_compressobjectstream.h index 2a72521d1d..94e02ce4cc 100644 --- a/xfa/fxfa/parser/cxfa_compressobjectstream.h +++ b/xfa/fxfa/parser/cxfa_compressobjectstream.h @@ -11,7 +11,7 @@ class CXFA_CompressObjectStream : public CXFA_Node { public: - CXFA_CompressObjectStream(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CompressObjectStream(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CompressObjectStream() override; }; diff --git a/xfa/fxfa/parser/cxfa_config.cpp b/xfa/fxfa/parser/cxfa_config.cpp index 104b90784c..79232a2223 100644 --- a/xfa/fxfa/parser/cxfa_config.cpp +++ b/xfa/fxfa/parser/cxfa_config.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"config"; } // namespace -CXFA_Config::CXFA_Config(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Config::CXFA_Config(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_config.h b/xfa/fxfa/parser/cxfa_config.h index e995380fdf..2ddb692f7d 100644 --- a/xfa/fxfa/parser/cxfa_config.h +++ b/xfa/fxfa/parser/cxfa_config.h @@ -11,7 +11,7 @@ class CXFA_Config : public CXFA_Node { public: - CXFA_Config(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Config(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Config() override; }; diff --git a/xfa/fxfa/parser/cxfa_conformance.cpp b/xfa/fxfa/parser/cxfa_conformance.cpp index a86a327fd8..f83c8eabb7 100644 --- a/xfa/fxfa/parser/cxfa_conformance.cpp +++ b/xfa/fxfa/parser/cxfa_conformance.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"conformance"; } // namespace -CXFA_Conformance::CXFA_Conformance(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Conformance::CXFA_Conformance(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_conformance.h b/xfa/fxfa/parser/cxfa_conformance.h index bb0b7657a3..11a72e7bff 100644 --- a/xfa/fxfa/parser/cxfa_conformance.h +++ b/xfa/fxfa/parser/cxfa_conformance.h @@ -11,7 +11,7 @@ class CXFA_Conformance : public CXFA_Node { public: - CXFA_Conformance(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Conformance(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Conformance() override; }; diff --git a/xfa/fxfa/parser/cxfa_connect.cpp b/xfa/fxfa/parser/cxfa_connect.cpp index 1490718fad..723be1e5f2 100644 --- a/xfa/fxfa/parser/cxfa_connect.cpp +++ b/xfa/fxfa/parser/cxfa_connect.cpp @@ -31,7 +31,7 @@ constexpr wchar_t kName[] = L"connect"; } // namespace -CXFA_Connect::CXFA_Connect(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Connect::CXFA_Connect(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_connect.h b/xfa/fxfa/parser/cxfa_connect.h index a052c9cdba..ac9157785b 100644 --- a/xfa/fxfa/parser/cxfa_connect.h +++ b/xfa/fxfa/parser/cxfa_connect.h @@ -11,7 +11,7 @@ class CXFA_Connect : public CXFA_Node { public: - CXFA_Connect(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Connect(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Connect() override; }; diff --git a/xfa/fxfa/parser/cxfa_connectionset.cpp b/xfa/fxfa/parser/cxfa_connectionset.cpp index 9f0d1a4b0a..6dc86b4ac2 100644 --- a/xfa/fxfa/parser/cxfa_connectionset.cpp +++ b/xfa/fxfa/parser/cxfa_connectionset.cpp @@ -12,7 +12,8 @@ constexpr wchar_t kName[] = L"connectionSet"; } // namespace -CXFA_ConnectionSet::CXFA_ConnectionSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ConnectionSet::CXFA_ConnectionSet(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_connectionset.h b/xfa/fxfa/parser/cxfa_connectionset.h index cf36cda7d9..59316f7b2c 100644 --- a/xfa/fxfa/parser/cxfa_connectionset.h +++ b/xfa/fxfa/parser/cxfa_connectionset.h @@ -11,7 +11,7 @@ class CXFA_ConnectionSet : public CXFA_Node { public: - CXFA_ConnectionSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ConnectionSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ConnectionSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_connectstring.cpp b/xfa/fxfa/parser/cxfa_connectstring.cpp index 0d3b5a01d7..12e37772d8 100644 --- a/xfa/fxfa/parser/cxfa_connectstring.cpp +++ b/xfa/fxfa/parser/cxfa_connectstring.cpp @@ -19,7 +19,8 @@ constexpr wchar_t kName[] = L"connectString"; } // namespace -CXFA_ConnectString::CXFA_ConnectString(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ConnectString::CXFA_ConnectString(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_connectstring.h b/xfa/fxfa/parser/cxfa_connectstring.h index f60d93751e..6c3a0b0577 100644 --- a/xfa/fxfa/parser/cxfa_connectstring.h +++ b/xfa/fxfa/parser/cxfa_connectstring.h @@ -11,7 +11,7 @@ class CXFA_ConnectString : public CXFA_Node { public: - CXFA_ConnectString(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ConnectString(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ConnectString() override; }; diff --git a/xfa/fxfa/parser/cxfa_contentarea.cpp b/xfa/fxfa/parser/cxfa_contentarea.cpp index 42492a6f3c..45e2a3ebad 100644 --- a/xfa/fxfa/parser/cxfa_contentarea.cpp +++ b/xfa/fxfa/parser/cxfa_contentarea.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"contentArea"; } // namespace -CXFA_ContentArea::CXFA_ContentArea(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ContentArea::CXFA_ContentArea(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_contentarea.h b/xfa/fxfa/parser/cxfa_contentarea.h index 49776813bb..3c5ff60397 100644 --- a/xfa/fxfa/parser/cxfa_contentarea.h +++ b/xfa/fxfa/parser/cxfa_contentarea.h @@ -11,7 +11,7 @@ class CXFA_ContentArea : public CXFA_Node { public: - CXFA_ContentArea(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ContentArea(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ContentArea() override; }; diff --git a/xfa/fxfa/parser/cxfa_contentcopy.cpp b/xfa/fxfa/parser/cxfa_contentcopy.cpp index 57e42afbfd..a55d57686c 100644 --- a/xfa/fxfa/parser/cxfa_contentcopy.cpp +++ b/xfa/fxfa/parser/cxfa_contentcopy.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"contentCopy"; } // namespace -CXFA_ContentCopy::CXFA_ContentCopy(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ContentCopy::CXFA_ContentCopy(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_contentcopy.h b/xfa/fxfa/parser/cxfa_contentcopy.h index d7a3e15528..d394c74730 100644 --- a/xfa/fxfa/parser/cxfa_contentcopy.h +++ b/xfa/fxfa/parser/cxfa_contentcopy.h @@ -11,7 +11,7 @@ class CXFA_ContentCopy : public CXFA_Node { public: - CXFA_ContentCopy(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ContentCopy(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ContentCopy() override; }; diff --git a/xfa/fxfa/parser/cxfa_copies.cpp b/xfa/fxfa/parser/cxfa_copies.cpp index 06bbea18f9..4ddf07ff24 100644 --- a/xfa/fxfa/parser/cxfa_copies.cpp +++ b/xfa/fxfa/parser/cxfa_copies.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"copies"; } // namespace -CXFA_Copies::CXFA_Copies(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Copies::CXFA_Copies(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_copies.h b/xfa/fxfa/parser/cxfa_copies.h index 00128e38a0..1ecd6160fc 100644 --- a/xfa/fxfa/parser/cxfa_copies.h +++ b/xfa/fxfa/parser/cxfa_copies.h @@ -11,7 +11,7 @@ class CXFA_Copies : public CXFA_Node { public: - CXFA_Copies(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Copies(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Copies() override; }; diff --git a/xfa/fxfa/parser/cxfa_corner.cpp b/xfa/fxfa/parser/cxfa_corner.cpp index 124be2b14f..7b8eecf1bb 100644 --- a/xfa/fxfa/parser/cxfa_corner.cpp +++ b/xfa/fxfa/parser/cxfa_corner.cpp @@ -30,7 +30,7 @@ constexpr wchar_t kName[] = L"corner"; } // namespace -CXFA_Corner::CXFA_Corner(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Corner::CXFA_Corner(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_corner.h b/xfa/fxfa/parser/cxfa_corner.h index 44b40a0a85..df21984332 100644 --- a/xfa/fxfa/parser/cxfa_corner.h +++ b/xfa/fxfa/parser/cxfa_corner.h @@ -11,7 +11,7 @@ class CXFA_Corner : public CXFA_Node { public: - CXFA_Corner(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Corner(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Corner() override; }; diff --git a/xfa/fxfa/parser/cxfa_creator.cpp b/xfa/fxfa/parser/cxfa_creator.cpp index 234391b215..2e65068595 100644 --- a/xfa/fxfa/parser/cxfa_creator.cpp +++ b/xfa/fxfa/parser/cxfa_creator.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"creator"; } // namespace -CXFA_Creator::CXFA_Creator(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Creator::CXFA_Creator(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_creator.h b/xfa/fxfa/parser/cxfa_creator.h index d9c9238640..c046883431 100644 --- a/xfa/fxfa/parser/cxfa_creator.h +++ b/xfa/fxfa/parser/cxfa_creator.h @@ -11,7 +11,7 @@ class CXFA_Creator : public CXFA_Node { public: - CXFA_Creator(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Creator(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Creator() override; }; diff --git a/xfa/fxfa/parser/cxfa_currencysymbol.cpp b/xfa/fxfa/parser/cxfa_currencysymbol.cpp index 3f60e3d298..f40372029e 100644 --- a/xfa/fxfa/parser/cxfa_currencysymbol.cpp +++ b/xfa/fxfa/parser/cxfa_currencysymbol.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"currencySymbol"; } // namespace CXFA_CurrencySymbol::CXFA_CurrencySymbol(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_currencysymbol.h b/xfa/fxfa/parser/cxfa_currencysymbol.h index 6cdb024738..271f7fc1e5 100644 --- a/xfa/fxfa/parser/cxfa_currencysymbol.h +++ b/xfa/fxfa/parser/cxfa_currencysymbol.h @@ -11,7 +11,7 @@ class CXFA_CurrencySymbol : public CXFA_Node { public: - CXFA_CurrencySymbol(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CurrencySymbol(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CurrencySymbol() override; }; diff --git a/xfa/fxfa/parser/cxfa_currencysymbols.cpp b/xfa/fxfa/parser/cxfa_currencysymbols.cpp index 24d81968a0..4160be98fc 100644 --- a/xfa/fxfa/parser/cxfa_currencysymbols.cpp +++ b/xfa/fxfa/parser/cxfa_currencysymbols.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"currencySymbols"; } // namespace CXFA_CurrencySymbols::CXFA_CurrencySymbols(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_currencysymbols.h b/xfa/fxfa/parser/cxfa_currencysymbols.h index 764f877eb2..acd3f2a5e2 100644 --- a/xfa/fxfa/parser/cxfa_currencysymbols.h +++ b/xfa/fxfa/parser/cxfa_currencysymbols.h @@ -11,7 +11,7 @@ class CXFA_CurrencySymbols : public CXFA_Node { public: - CXFA_CurrencySymbols(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CurrencySymbols(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CurrencySymbols() override; }; diff --git a/xfa/fxfa/parser/cxfa_currentpage.cpp b/xfa/fxfa/parser/cxfa_currentpage.cpp index b4d89bcf14..be200e4410 100644 --- a/xfa/fxfa/parser/cxfa_currentpage.cpp +++ b/xfa/fxfa/parser/cxfa_currentpage.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"currentPage"; } // namespace -CXFA_CurrentPage::CXFA_CurrentPage(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_CurrentPage::CXFA_CurrentPage(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_currentpage.h b/xfa/fxfa/parser/cxfa_currentpage.h index 55e4b544eb..d526b4a670 100644 --- a/xfa/fxfa/parser/cxfa_currentpage.h +++ b/xfa/fxfa/parser/cxfa_currentpage.h @@ -11,7 +11,7 @@ class CXFA_CurrentPage : public CXFA_Node { public: - CXFA_CurrentPage(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_CurrentPage(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_CurrentPage() override; }; diff --git a/xfa/fxfa/parser/cxfa_data.cpp b/xfa/fxfa/parser/cxfa_data.cpp index 45374f8dae..6fd66a98d4 100644 --- a/xfa/fxfa/parser/cxfa_data.cpp +++ b/xfa/fxfa/parser/cxfa_data.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"data"; } // namespace -CXFA_Data::CXFA_Data(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Data::CXFA_Data(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_data.h b/xfa/fxfa/parser/cxfa_data.h index a294ac62eb..cb30f615f3 100644 --- a/xfa/fxfa/parser/cxfa_data.h +++ b/xfa/fxfa/parser/cxfa_data.h @@ -11,7 +11,7 @@ class CXFA_Data : public CXFA_Node { public: - CXFA_Data(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Data(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Data() override; }; diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index edb7e1e186..1113ba49b6 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -489,8 +489,8 @@ bool CXFA_DataExporter::Export( const char* pChecksum) { CFX_XMLDoc* pXMLDoc = m_pDocument->GetXMLDoc(); if (pNode->IsModelNode()) { - switch (pNode->GetPacketID()) { - case XFA_XDPPACKET_XDP: { + switch (pNode->GetPacketType()) { + case XFA_PacketType::Xdp: { pStream->WriteString( L"<xdp:xdp xmlns:xdp=\"http://ns.adobe.com/xdp/\">"); for (CXFA_Node* pChild = pNode->GetNodeItem(XFA_NODEITEM_FirstChild); @@ -500,7 +500,7 @@ bool CXFA_DataExporter::Export( pStream->WriteString(L"</xdp:xdp\n>"); break; } - case XFA_XDPPACKET_Datasets: { + case XFA_PacketType::Datasets: { CFX_XMLElement* pElement = static_cast<CFX_XMLElement*>(pNode->GetXMLMappingNode()); if (!pElement || pElement->GetType() != FX_XMLNODE_Element) @@ -512,11 +512,11 @@ bool CXFA_DataExporter::Export( pXMLDoc->SaveXMLNode(pStream, pElement); break; } - case XFA_XDPPACKET_Form: { + case XFA_PacketType::Form: { XFA_DataExporter_RegenerateFormFile(pNode, pStream, pChecksum); break; } - case XFA_XDPPACKET_Template: + case XFA_PacketType::Template: default: { CFX_XMLElement* pElement = static_cast<CFX_XMLElement*>(pNode->GetXMLMappingNode()); diff --git a/xfa/fxfa/parser/cxfa_datagroup.cpp b/xfa/fxfa/parser/cxfa_datagroup.cpp index e2d5b30500..9b6514674b 100644 --- a/xfa/fxfa/parser/cxfa_datagroup.cpp +++ b/xfa/fxfa/parser/cxfa_datagroup.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"dataGroup"; } // namespace -CXFA_DataGroup::CXFA_DataGroup(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DataGroup::CXFA_DataGroup(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Datasets, diff --git a/xfa/fxfa/parser/cxfa_datagroup.h b/xfa/fxfa/parser/cxfa_datagroup.h index 6bc432d4df..649b09621d 100644 --- a/xfa/fxfa/parser/cxfa_datagroup.h +++ b/xfa/fxfa/parser/cxfa_datagroup.h @@ -11,7 +11,7 @@ class CXFA_DataGroup : public CXFA_Node { public: - CXFA_DataGroup(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DataGroup(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DataGroup() override; }; diff --git a/xfa/fxfa/parser/cxfa_datamodel.cpp b/xfa/fxfa/parser/cxfa_datamodel.cpp index c1001157c0..bda8ab521f 100644 --- a/xfa/fxfa/parser/cxfa_datamodel.cpp +++ b/xfa/fxfa/parser/cxfa_datamodel.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"dataModel"; } // namespace -CXFA_DataModel::CXFA_DataModel(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DataModel::CXFA_DataModel(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Datasets, diff --git a/xfa/fxfa/parser/cxfa_datamodel.h b/xfa/fxfa/parser/cxfa_datamodel.h index 6769d72f19..f414ea350f 100644 --- a/xfa/fxfa/parser/cxfa_datamodel.h +++ b/xfa/fxfa/parser/cxfa_datamodel.h @@ -11,7 +11,7 @@ class CXFA_DataModel : public CXFA_Node { public: - CXFA_DataModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DataModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DataModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_datavalue.cpp b/xfa/fxfa/parser/cxfa_datavalue.cpp index b1d1f6ee8c..5eb439bee2 100644 --- a/xfa/fxfa/parser/cxfa_datavalue.cpp +++ b/xfa/fxfa/parser/cxfa_datavalue.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"dataValue"; } // namespace -CXFA_DataValue::CXFA_DataValue(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DataValue::CXFA_DataValue(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Datasets, diff --git a/xfa/fxfa/parser/cxfa_datavalue.h b/xfa/fxfa/parser/cxfa_datavalue.h index 7d11f85cf0..8170aba0b7 100644 --- a/xfa/fxfa/parser/cxfa_datavalue.h +++ b/xfa/fxfa/parser/cxfa_datavalue.h @@ -11,7 +11,7 @@ class CXFA_DataValue : public CXFA_Node { public: - CXFA_DataValue(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DataValue(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DataValue() override; }; diff --git a/xfa/fxfa/parser/cxfa_datawindow.cpp b/xfa/fxfa/parser/cxfa_datawindow.cpp index 556bab47c7..8be722d520 100644 --- a/xfa/fxfa/parser/cxfa_datawindow.cpp +++ b/xfa/fxfa/parser/cxfa_datawindow.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"dataWindow"; } // namespace -CXFA_DataWindow::CXFA_DataWindow(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DataWindow::CXFA_DataWindow(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Datasets, diff --git a/xfa/fxfa/parser/cxfa_datawindow.h b/xfa/fxfa/parser/cxfa_datawindow.h index 3cafa947a5..cd2406fc8b 100644 --- a/xfa/fxfa/parser/cxfa_datawindow.h +++ b/xfa/fxfa/parser/cxfa_datawindow.h @@ -11,7 +11,7 @@ class CXFA_DataWindow : public CXFA_Node { public: - CXFA_DataWindow(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DataWindow(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DataWindow() override; }; diff --git a/xfa/fxfa/parser/cxfa_date.cpp b/xfa/fxfa/parser/cxfa_date.cpp index 76eba5be81..671a4d5d51 100644 --- a/xfa/fxfa/parser/cxfa_date.cpp +++ b/xfa/fxfa/parser/cxfa_date.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"date"; } // namespace -CXFA_Date::CXFA_Date(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Date::CXFA_Date(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_date.h b/xfa/fxfa/parser/cxfa_date.h index abe47db40d..e5ebb25ccb 100644 --- a/xfa/fxfa/parser/cxfa_date.h +++ b/xfa/fxfa/parser/cxfa_date.h @@ -11,7 +11,7 @@ class CXFA_Date : public CXFA_Node { public: - CXFA_Date(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Date(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Date() override; }; diff --git a/xfa/fxfa/parser/cxfa_datepattern.cpp b/xfa/fxfa/parser/cxfa_datepattern.cpp index 4fbecb671b..ff116b12ee 100644 --- a/xfa/fxfa/parser/cxfa_datepattern.cpp +++ b/xfa/fxfa/parser/cxfa_datepattern.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"datePattern"; } // namespace -CXFA_DatePattern::CXFA_DatePattern(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DatePattern::CXFA_DatePattern(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_datepattern.h b/xfa/fxfa/parser/cxfa_datepattern.h index b54a78f5fa..b66147851f 100644 --- a/xfa/fxfa/parser/cxfa_datepattern.h +++ b/xfa/fxfa/parser/cxfa_datepattern.h @@ -11,7 +11,7 @@ class CXFA_DatePattern : public CXFA_Node { public: - CXFA_DatePattern(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DatePattern(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DatePattern() override; }; diff --git a/xfa/fxfa/parser/cxfa_datepatterns.cpp b/xfa/fxfa/parser/cxfa_datepatterns.cpp index bf9ce612d1..37a380daea 100644 --- a/xfa/fxfa/parser/cxfa_datepatterns.cpp +++ b/xfa/fxfa/parser/cxfa_datepatterns.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"datePatterns"; } // namespace -CXFA_DatePatterns::CXFA_DatePatterns(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DatePatterns::CXFA_DatePatterns(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_datepatterns.h b/xfa/fxfa/parser/cxfa_datepatterns.h index a6ca4930cb..dfc55d08d3 100644 --- a/xfa/fxfa/parser/cxfa_datepatterns.h +++ b/xfa/fxfa/parser/cxfa_datepatterns.h @@ -11,7 +11,7 @@ class CXFA_DatePatterns : public CXFA_Node { public: - CXFA_DatePatterns(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DatePatterns(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DatePatterns() override; }; diff --git a/xfa/fxfa/parser/cxfa_datetime.cpp b/xfa/fxfa/parser/cxfa_datetime.cpp index a1c6fe826c..d6f99a05be 100644 --- a/xfa/fxfa/parser/cxfa_datetime.cpp +++ b/xfa/fxfa/parser/cxfa_datetime.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"dateTime"; } // namespace -CXFA_DateTime::CXFA_DateTime(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DateTime::CXFA_DateTime(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_datetime.h b/xfa/fxfa/parser/cxfa_datetime.h index 6033ee3c7e..f5cd6f680e 100644 --- a/xfa/fxfa/parser/cxfa_datetime.h +++ b/xfa/fxfa/parser/cxfa_datetime.h @@ -11,7 +11,7 @@ class CXFA_DateTime : public CXFA_Node { public: - CXFA_DateTime(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DateTime(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DateTime() override; }; diff --git a/xfa/fxfa/parser/cxfa_datetimeedit.cpp b/xfa/fxfa/parser/cxfa_datetimeedit.cpp index 57bd9074c0..8635f6377d 100644 --- a/xfa/fxfa/parser/cxfa_datetimeedit.cpp +++ b/xfa/fxfa/parser/cxfa_datetimeedit.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"dateTimeEdit"; } // namespace -CXFA_DateTimeEdit::CXFA_DateTimeEdit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DateTimeEdit::CXFA_DateTimeEdit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_datetimeedit.h b/xfa/fxfa/parser/cxfa_datetimeedit.h index 19463af3b4..bac7879cdb 100644 --- a/xfa/fxfa/parser/cxfa_datetimeedit.h +++ b/xfa/fxfa/parser/cxfa_datetimeedit.h @@ -11,7 +11,7 @@ class CXFA_DateTimeEdit : public CXFA_Node { public: - CXFA_DateTimeEdit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DateTimeEdit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DateTimeEdit() override; }; diff --git a/xfa/fxfa/parser/cxfa_datetimesymbols.cpp b/xfa/fxfa/parser/cxfa_datetimesymbols.cpp index 981b13ee5d..9f29666564 100644 --- a/xfa/fxfa/parser/cxfa_datetimesymbols.cpp +++ b/xfa/fxfa/parser/cxfa_datetimesymbols.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"dateTimeSymbols"; } // namespace CXFA_DateTimeSymbols::CXFA_DateTimeSymbols(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_datetimesymbols.h b/xfa/fxfa/parser/cxfa_datetimesymbols.h index b83712365f..e2296d6fd9 100644 --- a/xfa/fxfa/parser/cxfa_datetimesymbols.h +++ b/xfa/fxfa/parser/cxfa_datetimesymbols.h @@ -11,7 +11,7 @@ class CXFA_DateTimeSymbols : public CXFA_Node { public: - CXFA_DateTimeSymbols(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DateTimeSymbols(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DateTimeSymbols() override; }; diff --git a/xfa/fxfa/parser/cxfa_day.cpp b/xfa/fxfa/parser/cxfa_day.cpp index 0d36dbb389..c08b820e0b 100644 --- a/xfa/fxfa/parser/cxfa_day.cpp +++ b/xfa/fxfa/parser/cxfa_day.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"day"; } // namespace -CXFA_Day::CXFA_Day(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Day::CXFA_Day(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_day.h b/xfa/fxfa/parser/cxfa_day.h index 5cf30ea3ad..8d04bf4fb7 100644 --- a/xfa/fxfa/parser/cxfa_day.h +++ b/xfa/fxfa/parser/cxfa_day.h @@ -11,7 +11,7 @@ class CXFA_Day : public CXFA_Node { public: - CXFA_Day(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Day(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Day() override; }; diff --git a/xfa/fxfa/parser/cxfa_daynames.cpp b/xfa/fxfa/parser/cxfa_daynames.cpp index 91ea08e15a..47468e9743 100644 --- a/xfa/fxfa/parser/cxfa_daynames.cpp +++ b/xfa/fxfa/parser/cxfa_daynames.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"dayNames"; } // namespace -CXFA_DayNames::CXFA_DayNames(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DayNames::CXFA_DayNames(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_daynames.h b/xfa/fxfa/parser/cxfa_daynames.h index 87659080ca..d566e50e70 100644 --- a/xfa/fxfa/parser/cxfa_daynames.h +++ b/xfa/fxfa/parser/cxfa_daynames.h @@ -11,7 +11,7 @@ class CXFA_DayNames : public CXFA_Node { public: - CXFA_DayNames(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DayNames(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DayNames() override; }; diff --git a/xfa/fxfa/parser/cxfa_debug.cpp b/xfa/fxfa/parser/cxfa_debug.cpp index d72bfc10a8..91cfd6302b 100644 --- a/xfa/fxfa/parser/cxfa_debug.cpp +++ b/xfa/fxfa/parser/cxfa_debug.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"debug"; } // namespace -CXFA_Debug::CXFA_Debug(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Debug::CXFA_Debug(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_debug.h b/xfa/fxfa/parser/cxfa_debug.h index e42ab9fb9b..e2e4ed19c4 100644 --- a/xfa/fxfa/parser/cxfa_debug.h +++ b/xfa/fxfa/parser/cxfa_debug.h @@ -11,7 +11,7 @@ class CXFA_Debug : public CXFA_Node { public: - CXFA_Debug(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Debug(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Debug() override; }; diff --git a/xfa/fxfa/parser/cxfa_decimal.cpp b/xfa/fxfa/parser/cxfa_decimal.cpp index 6231e490dd..a8eaaea26a 100644 --- a/xfa/fxfa/parser/cxfa_decimal.cpp +++ b/xfa/fxfa/parser/cxfa_decimal.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"decimal"; } // namespace -CXFA_Decimal::CXFA_Decimal(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Decimal::CXFA_Decimal(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_decimal.h b/xfa/fxfa/parser/cxfa_decimal.h index bb19933ee2..da588964be 100644 --- a/xfa/fxfa/parser/cxfa_decimal.h +++ b/xfa/fxfa/parser/cxfa_decimal.h @@ -11,7 +11,7 @@ class CXFA_Decimal : public CXFA_Node { public: - CXFA_Decimal(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Decimal(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Decimal() override; }; diff --git a/xfa/fxfa/parser/cxfa_defaulttypeface.cpp b/xfa/fxfa/parser/cxfa_defaulttypeface.cpp index 31afda4356..31a93cc2cf 100644 --- a/xfa/fxfa/parser/cxfa_defaulttypeface.cpp +++ b/xfa/fxfa/parser/cxfa_defaulttypeface.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"defaultTypeface"; } // namespace CXFA_DefaultTypeface::CXFA_DefaultTypeface(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_defaulttypeface.h b/xfa/fxfa/parser/cxfa_defaulttypeface.h index 31ea0d4da8..511ed8f8f2 100644 --- a/xfa/fxfa/parser/cxfa_defaulttypeface.h +++ b/xfa/fxfa/parser/cxfa_defaulttypeface.h @@ -11,7 +11,7 @@ class CXFA_DefaultTypeface : public CXFA_Node { public: - CXFA_DefaultTypeface(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DefaultTypeface(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DefaultTypeface() override; }; diff --git a/xfa/fxfa/parser/cxfa_defaultui.cpp b/xfa/fxfa/parser/cxfa_defaultui.cpp index b93eebc6b4..9b8c9c0358 100644 --- a/xfa/fxfa/parser/cxfa_defaultui.cpp +++ b/xfa/fxfa/parser/cxfa_defaultui.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"defaultUi"; } // namespace -CXFA_DefaultUi::CXFA_DefaultUi(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DefaultUi::CXFA_DefaultUi(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_defaultui.h b/xfa/fxfa/parser/cxfa_defaultui.h index 27dc9618e1..ce149410d8 100644 --- a/xfa/fxfa/parser/cxfa_defaultui.h +++ b/xfa/fxfa/parser/cxfa_defaultui.h @@ -11,7 +11,7 @@ class CXFA_DefaultUi : public CXFA_Node { public: - CXFA_DefaultUi(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DefaultUi(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DefaultUi() override; }; diff --git a/xfa/fxfa/parser/cxfa_delete.cpp b/xfa/fxfa/parser/cxfa_delete.cpp index 41e619d8dd..b7519e152c 100644 --- a/xfa/fxfa/parser/cxfa_delete.cpp +++ b/xfa/fxfa/parser/cxfa_delete.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"delete"; } // namespace -CXFA_Delete::CXFA_Delete(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Delete::CXFA_Delete(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_delete.h b/xfa/fxfa/parser/cxfa_delete.h index f39d2e6e05..7c6058ab4f 100644 --- a/xfa/fxfa/parser/cxfa_delete.h +++ b/xfa/fxfa/parser/cxfa_delete.h @@ -11,7 +11,7 @@ class CXFA_Delete : public CXFA_Node { public: - CXFA_Delete(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Delete(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Delete() override; }; diff --git a/xfa/fxfa/parser/cxfa_delta.cpp b/xfa/fxfa/parser/cxfa_delta.cpp index c5da9c3875..4d472b8ddb 100644 --- a/xfa/fxfa/parser/cxfa_delta.cpp +++ b/xfa/fxfa/parser/cxfa_delta.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"delta"; } // namespace -CXFA_Delta::CXFA_Delta(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Delta::CXFA_Delta(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Form, diff --git a/xfa/fxfa/parser/cxfa_delta.h b/xfa/fxfa/parser/cxfa_delta.h index 249ffb95fd..693287ba3f 100644 --- a/xfa/fxfa/parser/cxfa_delta.h +++ b/xfa/fxfa/parser/cxfa_delta.h @@ -11,7 +11,7 @@ class CXFA_Delta : public CXFA_Node { public: - CXFA_Delta(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Delta(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Delta() override; }; diff --git a/xfa/fxfa/parser/cxfa_deltas.cpp b/xfa/fxfa/parser/cxfa_deltas.cpp index 89ef3a5895..2b843b53b4 100644 --- a/xfa/fxfa/parser/cxfa_deltas.cpp +++ b/xfa/fxfa/parser/cxfa_deltas.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"deltas"; } // namespace -CXFA_Deltas::CXFA_Deltas(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Deltas::CXFA_Deltas(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Form, diff --git a/xfa/fxfa/parser/cxfa_deltas.h b/xfa/fxfa/parser/cxfa_deltas.h index a996cd5eb5..37566ae307 100644 --- a/xfa/fxfa/parser/cxfa_deltas.h +++ b/xfa/fxfa/parser/cxfa_deltas.h @@ -11,7 +11,7 @@ class CXFA_Deltas : public CXFA_Node { public: - CXFA_Deltas(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Deltas(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Deltas() override; }; diff --git a/xfa/fxfa/parser/cxfa_desc.cpp b/xfa/fxfa/parser/cxfa_desc.cpp index e1321f8f8a..5c9df2c166 100644 --- a/xfa/fxfa/parser/cxfa_desc.cpp +++ b/xfa/fxfa/parser/cxfa_desc.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"desc"; } // namespace -CXFA_Desc::CXFA_Desc(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Desc::CXFA_Desc(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_desc.h b/xfa/fxfa/parser/cxfa_desc.h index 0ccd3b4a56..1811c63002 100644 --- a/xfa/fxfa/parser/cxfa_desc.h +++ b/xfa/fxfa/parser/cxfa_desc.h @@ -11,7 +11,7 @@ class CXFA_Desc : public CXFA_Node { public: - CXFA_Desc(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Desc(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Desc() override; }; diff --git a/xfa/fxfa/parser/cxfa_destination.cpp b/xfa/fxfa/parser/cxfa_destination.cpp index 452cd6450e..4e5d10b243 100644 --- a/xfa/fxfa/parser/cxfa_destination.cpp +++ b/xfa/fxfa/parser/cxfa_destination.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"destination"; } // namespace -CXFA_Destination::CXFA_Destination(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Destination::CXFA_Destination(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_destination.h b/xfa/fxfa/parser/cxfa_destination.h index 80513c0891..d9fc55329c 100644 --- a/xfa/fxfa/parser/cxfa_destination.h +++ b/xfa/fxfa/parser/cxfa_destination.h @@ -11,7 +11,7 @@ class CXFA_Destination : public CXFA_Node { public: - CXFA_Destination(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Destination(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Destination() override; }; diff --git a/xfa/fxfa/parser/cxfa_digestmethod.cpp b/xfa/fxfa/parser/cxfa_digestmethod.cpp index 3190e86c0e..a213d0a913 100644 --- a/xfa/fxfa/parser/cxfa_digestmethod.cpp +++ b/xfa/fxfa/parser/cxfa_digestmethod.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"digestMethod"; } // namespace -CXFA_DigestMethod::CXFA_DigestMethod(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DigestMethod::CXFA_DigestMethod(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_digestmethod.h b/xfa/fxfa/parser/cxfa_digestmethod.h index c0d15ed2f0..4ac22bb06a 100644 --- a/xfa/fxfa/parser/cxfa_digestmethod.h +++ b/xfa/fxfa/parser/cxfa_digestmethod.h @@ -11,7 +11,7 @@ class CXFA_DigestMethod : public CXFA_Node { public: - CXFA_DigestMethod(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DigestMethod(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DigestMethod() override; }; diff --git a/xfa/fxfa/parser/cxfa_digestmethods.cpp b/xfa/fxfa/parser/cxfa_digestmethods.cpp index 66109a6955..0608d123af 100644 --- a/xfa/fxfa/parser/cxfa_digestmethods.cpp +++ b/xfa/fxfa/parser/cxfa_digestmethods.cpp @@ -20,7 +20,8 @@ constexpr wchar_t kName[] = L"digestMethods"; } // namespace -CXFA_DigestMethods::CXFA_DigestMethods(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DigestMethods::CXFA_DigestMethods(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_digestmethods.h b/xfa/fxfa/parser/cxfa_digestmethods.h index 79780072c7..65d40fbfca 100644 --- a/xfa/fxfa/parser/cxfa_digestmethods.h +++ b/xfa/fxfa/parser/cxfa_digestmethods.h @@ -11,7 +11,7 @@ class CXFA_DigestMethods : public CXFA_Node { public: - CXFA_DigestMethods(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DigestMethods(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DigestMethods() override; }; diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 4e230ee87b..b23ba68a45 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -213,12 +213,10 @@ CXFA_Object* CXFA_Document::GetXFAObject(XFA_HashCode dwNodeNameHash) { } } -CXFA_Node* CXFA_Document::CreateNode(XFA_XDPPACKET packet, +CXFA_Node* CXFA_Document::CreateNode(XFA_PacketType packet, XFA_Element eElement) { - if (packet == XFA_XDPPACKET_UNKNOWN || packet >= XFA_XDPPACKET_LAST || - eElement == XFA_Element::Unknown) { + if (eElement == XFA_Element::Unknown) return nullptr; - } std::unique_ptr<CXFA_Node> pNode = CXFA_Node::Create(this, eElement, packet); if (!pNode) diff --git a/xfa/fxfa/parser/cxfa_document.h b/xfa/fxfa/parser/cxfa_document.h index 82ef661f17..bd576e68a5 100644 --- a/xfa/fxfa/parser/cxfa_document.h +++ b/xfa/fxfa/parser/cxfa_document.h @@ -87,7 +87,7 @@ class CXFA_Document { XFA_VERSION GetCurVersionMode() { return m_eCurVersionMode; } XFA_VERSION RecognizeXFAVersionNumber(const WideString& wsTemplateNS); - CXFA_Node* CreateNode(XFA_XDPPACKET packet, XFA_Element eElement); + CXFA_Node* CreateNode(XFA_PacketType packet, XFA_Element eElement); void DoProtoMerge(); void DoDataMerge(); diff --git a/xfa/fxfa/parser/cxfa_documentassembly.cpp b/xfa/fxfa/parser/cxfa_documentassembly.cpp index 5ddc90f01a..146071d424 100644 --- a/xfa/fxfa/parser/cxfa_documentassembly.cpp +++ b/xfa/fxfa/parser/cxfa_documentassembly.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"documentAssembly"; } // namespace CXFA_DocumentAssembly::CXFA_DocumentAssembly(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_documentassembly.h b/xfa/fxfa/parser/cxfa_documentassembly.h index b7b82e8549..c22d4a97b0 100644 --- a/xfa/fxfa/parser/cxfa_documentassembly.h +++ b/xfa/fxfa/parser/cxfa_documentassembly.h @@ -11,7 +11,7 @@ class CXFA_DocumentAssembly : public CXFA_Node { public: - CXFA_DocumentAssembly(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DocumentAssembly(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DocumentAssembly() override; }; diff --git a/xfa/fxfa/parser/cxfa_draw.cpp b/xfa/fxfa/parser/cxfa_draw.cpp index 7d87d44010..073d3154e4 100644 --- a/xfa/fxfa/parser/cxfa_draw.cpp +++ b/xfa/fxfa/parser/cxfa_draw.cpp @@ -47,7 +47,7 @@ constexpr wchar_t kName[] = L"draw"; } // namespace -CXFA_Draw::CXFA_Draw(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Draw::CXFA_Draw(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_draw.h b/xfa/fxfa/parser/cxfa_draw.h index 9ca22b6289..603103b091 100644 --- a/xfa/fxfa/parser/cxfa_draw.h +++ b/xfa/fxfa/parser/cxfa_draw.h @@ -11,7 +11,7 @@ class CXFA_Draw : public CXFA_Node { public: - CXFA_Draw(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Draw(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Draw() override; }; diff --git a/xfa/fxfa/parser/cxfa_driver.cpp b/xfa/fxfa/parser/cxfa_driver.cpp index 77d23c9980..883cbf6f9b 100644 --- a/xfa/fxfa/parser/cxfa_driver.cpp +++ b/xfa/fxfa/parser/cxfa_driver.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"driver"; } // namespace -CXFA_Driver::CXFA_Driver(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Driver::CXFA_Driver(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_driver.h b/xfa/fxfa/parser/cxfa_driver.h index 781a69bed5..aee732edf7 100644 --- a/xfa/fxfa/parser/cxfa_driver.h +++ b/xfa/fxfa/parser/cxfa_driver.h @@ -11,7 +11,7 @@ class CXFA_Driver : public CXFA_Node { public: - CXFA_Driver(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Driver(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Driver() override; }; diff --git a/xfa/fxfa/parser/cxfa_dsigdata.cpp b/xfa/fxfa/parser/cxfa_dsigdata.cpp index f1412aa19c..88d3e8e438 100644 --- a/xfa/fxfa/parser/cxfa_dsigdata.cpp +++ b/xfa/fxfa/parser/cxfa_dsigdata.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"dSigData"; } // namespace -CXFA_DSigData::CXFA_DSigData(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DSigData::CXFA_DSigData(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_dsigdata.h b/xfa/fxfa/parser/cxfa_dsigdata.h index 00b61e33a0..0cbaeb4402 100644 --- a/xfa/fxfa/parser/cxfa_dsigdata.h +++ b/xfa/fxfa/parser/cxfa_dsigdata.h @@ -11,7 +11,7 @@ class CXFA_DSigData : public CXFA_Node { public: - CXFA_DSigData(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DSigData(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DSigData() override; }; diff --git a/xfa/fxfa/parser/cxfa_duplexoption.cpp b/xfa/fxfa/parser/cxfa_duplexoption.cpp index a99a2e8076..f8d417098d 100644 --- a/xfa/fxfa/parser/cxfa_duplexoption.cpp +++ b/xfa/fxfa/parser/cxfa_duplexoption.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"duplexOption"; } // namespace -CXFA_DuplexOption::CXFA_DuplexOption(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DuplexOption::CXFA_DuplexOption(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_duplexoption.h b/xfa/fxfa/parser/cxfa_duplexoption.h index a9f8f17ec6..69034ce594 100644 --- a/xfa/fxfa/parser/cxfa_duplexoption.h +++ b/xfa/fxfa/parser/cxfa_duplexoption.h @@ -11,7 +11,7 @@ class CXFA_DuplexOption : public CXFA_Node { public: - CXFA_DuplexOption(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DuplexOption(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DuplexOption() override; }; diff --git a/xfa/fxfa/parser/cxfa_dynamicrender.cpp b/xfa/fxfa/parser/cxfa_dynamicrender.cpp index 901937d83d..a60e192521 100644 --- a/xfa/fxfa/parser/cxfa_dynamicrender.cpp +++ b/xfa/fxfa/parser/cxfa_dynamicrender.cpp @@ -17,7 +17,8 @@ constexpr wchar_t kName[] = L"dynamicRender"; } // namespace -CXFA_DynamicRender::CXFA_DynamicRender(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_DynamicRender::CXFA_DynamicRender(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_dynamicrender.h b/xfa/fxfa/parser/cxfa_dynamicrender.h index 1856957471..f7c54fafab 100644 --- a/xfa/fxfa/parser/cxfa_dynamicrender.h +++ b/xfa/fxfa/parser/cxfa_dynamicrender.h @@ -11,7 +11,7 @@ class CXFA_DynamicRender : public CXFA_Node { public: - CXFA_DynamicRender(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_DynamicRender(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_DynamicRender() override; }; diff --git a/xfa/fxfa/parser/cxfa_edge.cpp b/xfa/fxfa/parser/cxfa_edge.cpp index 114063c72a..310a7e27b0 100644 --- a/xfa/fxfa/parser/cxfa_edge.cpp +++ b/xfa/fxfa/parser/cxfa_edge.cpp @@ -28,7 +28,7 @@ constexpr wchar_t kName[] = L"edge"; } // namespace -CXFA_Edge::CXFA_Edge(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Edge::CXFA_Edge(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_edge.h b/xfa/fxfa/parser/cxfa_edge.h index fa02e06c32..135ea2a628 100644 --- a/xfa/fxfa/parser/cxfa_edge.h +++ b/xfa/fxfa/parser/cxfa_edge.h @@ -11,7 +11,7 @@ class CXFA_Edge : public CXFA_Node { public: - CXFA_Edge(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Edge(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Edge() override; }; diff --git a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp index 79d3cb3e79..a2c5d0f89b 100644 --- a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"effectiveInputPolicy"; } // namespace CXFA_EffectiveInputPolicy::CXFA_EffectiveInputPolicy(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.h b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.h index a88ae98b3e..52a60a45d9 100644 --- a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.h +++ b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.h @@ -11,7 +11,7 @@ class CXFA_EffectiveInputPolicy : public CXFA_Node { public: - CXFA_EffectiveInputPolicy(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EffectiveInputPolicy(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EffectiveInputPolicy() override; }; diff --git a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp index c726ef9af7..e1ab37020c 100644 --- a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"effectiveOutputPolicy"; } // namespace CXFA_EffectiveOutputPolicy::CXFA_EffectiveOutputPolicy(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.h b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.h index 10c852771e..b2317d520e 100644 --- a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.h +++ b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.h @@ -11,7 +11,7 @@ class CXFA_EffectiveOutputPolicy : public CXFA_Node { public: - CXFA_EffectiveOutputPolicy(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EffectiveOutputPolicy(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EffectiveOutputPolicy() override; }; diff --git a/xfa/fxfa/parser/cxfa_embed.cpp b/xfa/fxfa/parser/cxfa_embed.cpp index 2e7423bd4a..f65fea4086 100644 --- a/xfa/fxfa/parser/cxfa_embed.cpp +++ b/xfa/fxfa/parser/cxfa_embed.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"embed"; } // namespace -CXFA_Embed::CXFA_Embed(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Embed::CXFA_Embed(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_embed.h b/xfa/fxfa/parser/cxfa_embed.h index 4aa746b8ac..d1308407b2 100644 --- a/xfa/fxfa/parser/cxfa_embed.h +++ b/xfa/fxfa/parser/cxfa_embed.h @@ -11,7 +11,7 @@ class CXFA_Embed : public CXFA_Node { public: - CXFA_Embed(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Embed(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Embed() override; }; diff --git a/xfa/fxfa/parser/cxfa_encoding.cpp b/xfa/fxfa/parser/cxfa_encoding.cpp index 0752df7a5a..27269b4f2a 100644 --- a/xfa/fxfa/parser/cxfa_encoding.cpp +++ b/xfa/fxfa/parser/cxfa_encoding.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"encoding"; } // namespace -CXFA_Encoding::CXFA_Encoding(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Encoding::CXFA_Encoding(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_encoding.h b/xfa/fxfa/parser/cxfa_encoding.h index 4e520e5d37..ad41b01b85 100644 --- a/xfa/fxfa/parser/cxfa_encoding.h +++ b/xfa/fxfa/parser/cxfa_encoding.h @@ -11,7 +11,7 @@ class CXFA_Encoding : public CXFA_Node { public: - CXFA_Encoding(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Encoding(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Encoding() override; }; diff --git a/xfa/fxfa/parser/cxfa_encodings.cpp b/xfa/fxfa/parser/cxfa_encodings.cpp index 45f4e7a83f..dddcf1b74d 100644 --- a/xfa/fxfa/parser/cxfa_encodings.cpp +++ b/xfa/fxfa/parser/cxfa_encodings.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"encodings"; } // namespace -CXFA_Encodings::CXFA_Encodings(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Encodings::CXFA_Encodings(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_encodings.h b/xfa/fxfa/parser/cxfa_encodings.h index 19d51d2989..d3876deefc 100644 --- a/xfa/fxfa/parser/cxfa_encodings.h +++ b/xfa/fxfa/parser/cxfa_encodings.h @@ -11,7 +11,7 @@ class CXFA_Encodings : public CXFA_Node { public: - CXFA_Encodings(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Encodings(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Encodings() override; }; diff --git a/xfa/fxfa/parser/cxfa_encrypt.cpp b/xfa/fxfa/parser/cxfa_encrypt.cpp index ea28df9bb9..2e38bef4c0 100644 --- a/xfa/fxfa/parser/cxfa_encrypt.cpp +++ b/xfa/fxfa/parser/cxfa_encrypt.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"encrypt"; } // namespace -CXFA_Encrypt::CXFA_Encrypt(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Encrypt::CXFA_Encrypt(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_encrypt.h b/xfa/fxfa/parser/cxfa_encrypt.h index 13d4e57bdc..4968db62c8 100644 --- a/xfa/fxfa/parser/cxfa_encrypt.h +++ b/xfa/fxfa/parser/cxfa_encrypt.h @@ -11,7 +11,7 @@ class CXFA_Encrypt : public CXFA_Node { public: - CXFA_Encrypt(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Encrypt(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Encrypt() override; }; diff --git a/xfa/fxfa/parser/cxfa_encryption.cpp b/xfa/fxfa/parser/cxfa_encryption.cpp index fcba1c2668..2a876fed6e 100644 --- a/xfa/fxfa/parser/cxfa_encryption.cpp +++ b/xfa/fxfa/parser/cxfa_encryption.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"encryption"; } // namespace -CXFA_Encryption::CXFA_Encryption(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Encryption::CXFA_Encryption(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_encryption.h b/xfa/fxfa/parser/cxfa_encryption.h index 32c96d7da8..f2028ee850 100644 --- a/xfa/fxfa/parser/cxfa_encryption.h +++ b/xfa/fxfa/parser/cxfa_encryption.h @@ -11,7 +11,7 @@ class CXFA_Encryption : public CXFA_Node { public: - CXFA_Encryption(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Encryption(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Encryption() override; }; diff --git a/xfa/fxfa/parser/cxfa_encryptionlevel.cpp b/xfa/fxfa/parser/cxfa_encryptionlevel.cpp index 7499be7df9..099b03533e 100644 --- a/xfa/fxfa/parser/cxfa_encryptionlevel.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionlevel.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"encryptionLevel"; } // namespace CXFA_EncryptionLevel::CXFA_EncryptionLevel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_encryptionlevel.h b/xfa/fxfa/parser/cxfa_encryptionlevel.h index 872bd3f784..1bb80ce126 100644 --- a/xfa/fxfa/parser/cxfa_encryptionlevel.h +++ b/xfa/fxfa/parser/cxfa_encryptionlevel.h @@ -11,7 +11,7 @@ class CXFA_EncryptionLevel : public CXFA_Node { public: - CXFA_EncryptionLevel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EncryptionLevel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EncryptionLevel() override; }; diff --git a/xfa/fxfa/parser/cxfa_encryptionmethod.cpp b/xfa/fxfa/parser/cxfa_encryptionmethod.cpp index dba18662cf..e3402e2247 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethod.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionmethod.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"encryptionMethod"; } // namespace CXFA_EncryptionMethod::CXFA_EncryptionMethod(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_encryptionmethod.h b/xfa/fxfa/parser/cxfa_encryptionmethod.h index 99e29333d2..2c86001c93 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethod.h +++ b/xfa/fxfa/parser/cxfa_encryptionmethod.h @@ -11,7 +11,7 @@ class CXFA_EncryptionMethod : public CXFA_Node { public: - CXFA_EncryptionMethod(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EncryptionMethod(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EncryptionMethod() override; }; diff --git a/xfa/fxfa/parser/cxfa_encryptionmethods.cpp b/xfa/fxfa/parser/cxfa_encryptionmethods.cpp index b4b3537196..c8913d1159 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethods.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionmethods.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"encryptionMethods"; } // namespace CXFA_EncryptionMethods::CXFA_EncryptionMethods(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_encryptionmethods.h b/xfa/fxfa/parser/cxfa_encryptionmethods.h index e09c845968..9fcc0b5e9f 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethods.h +++ b/xfa/fxfa/parser/cxfa_encryptionmethods.h @@ -11,7 +11,7 @@ class CXFA_EncryptionMethods : public CXFA_Node { public: - CXFA_EncryptionMethods(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EncryptionMethods(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EncryptionMethods() override; }; diff --git a/xfa/fxfa/parser/cxfa_enforce.cpp b/xfa/fxfa/parser/cxfa_enforce.cpp index d50d992e07..59b6426ec9 100644 --- a/xfa/fxfa/parser/cxfa_enforce.cpp +++ b/xfa/fxfa/parser/cxfa_enforce.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"enforce"; } // namespace -CXFA_Enforce::CXFA_Enforce(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Enforce::CXFA_Enforce(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_enforce.h b/xfa/fxfa/parser/cxfa_enforce.h index 8c863ba430..3ccd8b8f2b 100644 --- a/xfa/fxfa/parser/cxfa_enforce.h +++ b/xfa/fxfa/parser/cxfa_enforce.h @@ -11,7 +11,7 @@ class CXFA_Enforce : public CXFA_Node { public: - CXFA_Enforce(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Enforce(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Enforce() override; }; diff --git a/xfa/fxfa/parser/cxfa_equate.cpp b/xfa/fxfa/parser/cxfa_equate.cpp index 02fa339f75..e927fbcf4c 100644 --- a/xfa/fxfa/parser/cxfa_equate.cpp +++ b/xfa/fxfa/parser/cxfa_equate.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"equate"; } // namespace -CXFA_Equate::CXFA_Equate(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Equate::CXFA_Equate(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_equate.h b/xfa/fxfa/parser/cxfa_equate.h index 4939eadda1..0a28182ee8 100644 --- a/xfa/fxfa/parser/cxfa_equate.h +++ b/xfa/fxfa/parser/cxfa_equate.h @@ -11,7 +11,7 @@ class CXFA_Equate : public CXFA_Node { public: - CXFA_Equate(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Equate(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Equate() override; }; diff --git a/xfa/fxfa/parser/cxfa_equaterange.cpp b/xfa/fxfa/parser/cxfa_equaterange.cpp index f3193c8c0a..6f46a1f92f 100644 --- a/xfa/fxfa/parser/cxfa_equaterange.cpp +++ b/xfa/fxfa/parser/cxfa_equaterange.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"equateRange"; } // namespace -CXFA_EquateRange::CXFA_EquateRange(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_EquateRange::CXFA_EquateRange(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_equaterange.h b/xfa/fxfa/parser/cxfa_equaterange.h index 9ff047a448..86c86b1870 100644 --- a/xfa/fxfa/parser/cxfa_equaterange.h +++ b/xfa/fxfa/parser/cxfa_equaterange.h @@ -11,7 +11,7 @@ class CXFA_EquateRange : public CXFA_Node { public: - CXFA_EquateRange(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EquateRange(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EquateRange() override; }; diff --git a/xfa/fxfa/parser/cxfa_era.cpp b/xfa/fxfa/parser/cxfa_era.cpp index 6ddc1dafa7..6051676b14 100644 --- a/xfa/fxfa/parser/cxfa_era.cpp +++ b/xfa/fxfa/parser/cxfa_era.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"era"; } // namespace -CXFA_Era::CXFA_Era(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Era::CXFA_Era(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_era.h b/xfa/fxfa/parser/cxfa_era.h index ece3b2cc54..a46a574180 100644 --- a/xfa/fxfa/parser/cxfa_era.h +++ b/xfa/fxfa/parser/cxfa_era.h @@ -11,7 +11,7 @@ class CXFA_Era : public CXFA_Node { public: - CXFA_Era(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Era(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Era() override; }; diff --git a/xfa/fxfa/parser/cxfa_eranames.cpp b/xfa/fxfa/parser/cxfa_eranames.cpp index 358b7b08d9..06bd2ca4ef 100644 --- a/xfa/fxfa/parser/cxfa_eranames.cpp +++ b/xfa/fxfa/parser/cxfa_eranames.cpp @@ -15,7 +15,7 @@ constexpr wchar_t kName[] = L"eraNames"; } // namespace -CXFA_EraNames::CXFA_EraNames(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_EraNames::CXFA_EraNames(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_eranames.h b/xfa/fxfa/parser/cxfa_eranames.h index 128e68d3bc..4c8f7880a7 100644 --- a/xfa/fxfa/parser/cxfa_eranames.h +++ b/xfa/fxfa/parser/cxfa_eranames.h @@ -11,7 +11,7 @@ class CXFA_EraNames : public CXFA_Node { public: - CXFA_EraNames(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EraNames(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EraNames() override; }; diff --git a/xfa/fxfa/parser/cxfa_event.cpp b/xfa/fxfa/parser/cxfa_event.cpp index 0e3e71bd20..ca5aa58a2b 100644 --- a/xfa/fxfa/parser/cxfa_event.cpp +++ b/xfa/fxfa/parser/cxfa_event.cpp @@ -31,7 +31,7 @@ constexpr wchar_t kName[] = L"event"; } // namespace -CXFA_Event::CXFA_Event(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Event::CXFA_Event(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_event.h b/xfa/fxfa/parser/cxfa_event.h index 5ff362d4fc..655e776b85 100644 --- a/xfa/fxfa/parser/cxfa_event.h +++ b/xfa/fxfa/parser/cxfa_event.h @@ -11,7 +11,7 @@ class CXFA_Event : public CXFA_Node { public: - CXFA_Event(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Event(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Event() override; }; diff --git a/xfa/fxfa/parser/cxfa_eventpseudomodel.cpp b/xfa/fxfa/parser/cxfa_eventpseudomodel.cpp index 75128f6098..b4a5fedd60 100644 --- a/xfa/fxfa/parser/cxfa_eventpseudomodel.cpp +++ b/xfa/fxfa/parser/cxfa_eventpseudomodel.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"eventPseudoModel"; } // namespace CXFA_EventPseudoModel::CXFA_EventPseudoModel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_eventpseudomodel.h b/xfa/fxfa/parser/cxfa_eventpseudomodel.h index 3546e6d2bc..018e2ea961 100644 --- a/xfa/fxfa/parser/cxfa_eventpseudomodel.h +++ b/xfa/fxfa/parser/cxfa_eventpseudomodel.h @@ -11,7 +11,7 @@ class CXFA_EventPseudoModel : public CXFA_Node { public: - CXFA_EventPseudoModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_EventPseudoModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_EventPseudoModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_exclgroup.cpp b/xfa/fxfa/parser/cxfa_exclgroup.cpp index b8255c501e..39ecc72630 100644 --- a/xfa/fxfa/parser/cxfa_exclgroup.cpp +++ b/xfa/fxfa/parser/cxfa_exclgroup.cpp @@ -49,7 +49,7 @@ constexpr wchar_t kName[] = L"exclGroup"; } // namespace -CXFA_ExclGroup::CXFA_ExclGroup(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ExclGroup::CXFA_ExclGroup(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_exclgroup.h b/xfa/fxfa/parser/cxfa_exclgroup.h index 62aeb84960..5a3c8a3fee 100644 --- a/xfa/fxfa/parser/cxfa_exclgroup.h +++ b/xfa/fxfa/parser/cxfa_exclgroup.h @@ -11,7 +11,7 @@ class CXFA_ExclGroup : public CXFA_Node { public: - CXFA_ExclGroup(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ExclGroup(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ExclGroup() override; }; diff --git a/xfa/fxfa/parser/cxfa_exclude.cpp b/xfa/fxfa/parser/cxfa_exclude.cpp index 633914adcf..e07d92a146 100644 --- a/xfa/fxfa/parser/cxfa_exclude.cpp +++ b/xfa/fxfa/parser/cxfa_exclude.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"exclude"; } // namespace -CXFA_Exclude::CXFA_Exclude(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Exclude::CXFA_Exclude(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_exclude.h b/xfa/fxfa/parser/cxfa_exclude.h index fc8eada523..0f78707ea6 100644 --- a/xfa/fxfa/parser/cxfa_exclude.h +++ b/xfa/fxfa/parser/cxfa_exclude.h @@ -11,7 +11,7 @@ class CXFA_Exclude : public CXFA_Node { public: - CXFA_Exclude(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Exclude(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Exclude() override; }; diff --git a/xfa/fxfa/parser/cxfa_excludens.cpp b/xfa/fxfa/parser/cxfa_excludens.cpp index 7a400e6480..b149e864e0 100644 --- a/xfa/fxfa/parser/cxfa_excludens.cpp +++ b/xfa/fxfa/parser/cxfa_excludens.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"excludeNS"; } // namespace -CXFA_ExcludeNS::CXFA_ExcludeNS(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ExcludeNS::CXFA_ExcludeNS(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_excludens.h b/xfa/fxfa/parser/cxfa_excludens.h index b70654e63e..c5cb548e53 100644 --- a/xfa/fxfa/parser/cxfa_excludens.h +++ b/xfa/fxfa/parser/cxfa_excludens.h @@ -11,7 +11,7 @@ class CXFA_ExcludeNS : public CXFA_Node { public: - CXFA_ExcludeNS(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ExcludeNS(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ExcludeNS() override; }; diff --git a/xfa/fxfa/parser/cxfa_exdata.cpp b/xfa/fxfa/parser/cxfa_exdata.cpp index 9c3102f285..0a73d78df3 100644 --- a/xfa/fxfa/parser/cxfa_exdata.cpp +++ b/xfa/fxfa/parser/cxfa_exdata.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"exData"; } // namespace -CXFA_ExData::CXFA_ExData(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ExData::CXFA_ExData(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_exdata.h b/xfa/fxfa/parser/cxfa_exdata.h index 264c31b223..92ea0e6c48 100644 --- a/xfa/fxfa/parser/cxfa_exdata.h +++ b/xfa/fxfa/parser/cxfa_exdata.h @@ -11,7 +11,7 @@ class CXFA_ExData : public CXFA_Node { public: - CXFA_ExData(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ExData(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ExData() override; }; diff --git a/xfa/fxfa/parser/cxfa_execute.cpp b/xfa/fxfa/parser/cxfa_execute.cpp index bc570c8152..f0a979668b 100644 --- a/xfa/fxfa/parser/cxfa_execute.cpp +++ b/xfa/fxfa/parser/cxfa_execute.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"execute"; } // namespace -CXFA_Execute::CXFA_Execute(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Execute::CXFA_Execute(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_execute.h b/xfa/fxfa/parser/cxfa_execute.h index aa7daf4423..2d9f1581ad 100644 --- a/xfa/fxfa/parser/cxfa_execute.h +++ b/xfa/fxfa/parser/cxfa_execute.h @@ -11,7 +11,7 @@ class CXFA_Execute : public CXFA_Node { public: - CXFA_Execute(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Execute(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Execute() override; }; diff --git a/xfa/fxfa/parser/cxfa_exobject.cpp b/xfa/fxfa/parser/cxfa_exobject.cpp index 3e8b590a99..bc9647a0b5 100644 --- a/xfa/fxfa/parser/cxfa_exobject.cpp +++ b/xfa/fxfa/parser/cxfa_exobject.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"exObject"; } // namespace -CXFA_ExObject::CXFA_ExObject(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ExObject::CXFA_ExObject(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_exobject.h b/xfa/fxfa/parser/cxfa_exobject.h index 8424553538..b4d7de9eb8 100644 --- a/xfa/fxfa/parser/cxfa_exobject.h +++ b/xfa/fxfa/parser/cxfa_exobject.h @@ -11,7 +11,7 @@ class CXFA_ExObject : public CXFA_Node { public: - CXFA_ExObject(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ExObject(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ExObject() override; }; diff --git a/xfa/fxfa/parser/cxfa_extras.cpp b/xfa/fxfa/parser/cxfa_extras.cpp index 5684dde79f..bf155c70c2 100644 --- a/xfa/fxfa/parser/cxfa_extras.cpp +++ b/xfa/fxfa/parser/cxfa_extras.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"extras"; } // namespace -CXFA_Extras::CXFA_Extras(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Extras::CXFA_Extras(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_extras.h b/xfa/fxfa/parser/cxfa_extras.h index 8be1239a77..3b3c6b4a95 100644 --- a/xfa/fxfa/parser/cxfa_extras.h +++ b/xfa/fxfa/parser/cxfa_extras.h @@ -11,7 +11,7 @@ class CXFA_Extras : public CXFA_Node { public: - CXFA_Extras(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Extras(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Extras() override; }; diff --git a/xfa/fxfa/parser/cxfa_field.cpp b/xfa/fxfa/parser/cxfa_field.cpp index 95fdcb081e..5fd07d654e 100644 --- a/xfa/fxfa/parser/cxfa_field.cpp +++ b/xfa/fxfa/parser/cxfa_field.cpp @@ -52,7 +52,7 @@ constexpr wchar_t kName[] = L"field"; } // namespace -CXFA_Field::CXFA_Field(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Field::CXFA_Field(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_field.h b/xfa/fxfa/parser/cxfa_field.h index d662a4c424..b2f7a052de 100644 --- a/xfa/fxfa/parser/cxfa_field.h +++ b/xfa/fxfa/parser/cxfa_field.h @@ -11,7 +11,7 @@ class CXFA_Field : public CXFA_Node { public: - CXFA_Field(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Field(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Field() override; }; diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp index 4b045cef20..340d94cfa2 100644 --- a/xfa/fxfa/parser/cxfa_fill.cpp +++ b/xfa/fxfa/parser/cxfa_fill.cpp @@ -30,7 +30,7 @@ constexpr wchar_t kName[] = L"fill"; } // namespace -CXFA_Fill::CXFA_Fill(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Fill::CXFA_Fill(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_fill.h b/xfa/fxfa/parser/cxfa_fill.h index 681b44de84..ba18b91b72 100644 --- a/xfa/fxfa/parser/cxfa_fill.h +++ b/xfa/fxfa/parser/cxfa_fill.h @@ -11,7 +11,7 @@ class CXFA_Fill : public CXFA_Node { public: - CXFA_Fill(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Fill(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Fill() override; }; diff --git a/xfa/fxfa/parser/cxfa_filter.cpp b/xfa/fxfa/parser/cxfa_filter.cpp index cf45278cd4..2bb5952c49 100644 --- a/xfa/fxfa/parser/cxfa_filter.cpp +++ b/xfa/fxfa/parser/cxfa_filter.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"filter"; } // namespace -CXFA_Filter::CXFA_Filter(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Filter::CXFA_Filter(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_filter.h b/xfa/fxfa/parser/cxfa_filter.h index 4b636f821b..2ac069ac24 100644 --- a/xfa/fxfa/parser/cxfa_filter.h +++ b/xfa/fxfa/parser/cxfa_filter.h @@ -11,7 +11,7 @@ class CXFA_Filter : public CXFA_Node { public: - CXFA_Filter(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Filter(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Filter() override; }; diff --git a/xfa/fxfa/parser/cxfa_fliplabel.cpp b/xfa/fxfa/parser/cxfa_fliplabel.cpp index f95757d57c..2227e8bb20 100644 --- a/xfa/fxfa/parser/cxfa_fliplabel.cpp +++ b/xfa/fxfa/parser/cxfa_fliplabel.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"flipLabel"; } // namespace -CXFA_FlipLabel::CXFA_FlipLabel(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_FlipLabel::CXFA_FlipLabel(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_fliplabel.h b/xfa/fxfa/parser/cxfa_fliplabel.h index 49657694ef..dac0564b51 100644 --- a/xfa/fxfa/parser/cxfa_fliplabel.h +++ b/xfa/fxfa/parser/cxfa_fliplabel.h @@ -11,7 +11,7 @@ class CXFA_FlipLabel : public CXFA_Node { public: - CXFA_FlipLabel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_FlipLabel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_FlipLabel() override; }; diff --git a/xfa/fxfa/parser/cxfa_float.cpp b/xfa/fxfa/parser/cxfa_float.cpp index d0e4a1b5ad..b1b0116cf9 100644 --- a/xfa/fxfa/parser/cxfa_float.cpp +++ b/xfa/fxfa/parser/cxfa_float.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"float"; } // namespace -CXFA_Float::CXFA_Float(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Float::CXFA_Float(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_float.h b/xfa/fxfa/parser/cxfa_float.h index 02f3f79a47..f93b3dd199 100644 --- a/xfa/fxfa/parser/cxfa_float.h +++ b/xfa/fxfa/parser/cxfa_float.h @@ -11,7 +11,7 @@ class CXFA_Float : public CXFA_Node { public: - CXFA_Float(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Float(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Float() override; }; diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp index 06a869a628..c81e951229 100644 --- a/xfa/fxfa/parser/cxfa_font.cpp +++ b/xfa/fxfa/parser/cxfa_font.cpp @@ -47,7 +47,7 @@ constexpr wchar_t kName[] = L"font"; } // namespace -CXFA_Font::CXFA_Font(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Font::CXFA_Font(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_font.h b/xfa/fxfa/parser/cxfa_font.h index f43610fc93..59b0c71e8c 100644 --- a/xfa/fxfa/parser/cxfa_font.h +++ b/xfa/fxfa/parser/cxfa_font.h @@ -11,7 +11,7 @@ class CXFA_Font : public CXFA_Node { public: - CXFA_Font(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Font(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Font() override; }; diff --git a/xfa/fxfa/parser/cxfa_fontinfo.cpp b/xfa/fxfa/parser/cxfa_fontinfo.cpp index 4ac246fe8c..ee1dc6ed46 100644 --- a/xfa/fxfa/parser/cxfa_fontinfo.cpp +++ b/xfa/fxfa/parser/cxfa_fontinfo.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"fontInfo"; } // namespace -CXFA_FontInfo::CXFA_FontInfo(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_FontInfo::CXFA_FontInfo(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_fontinfo.h b/xfa/fxfa/parser/cxfa_fontinfo.h index 7e84c07bcd..f9facd8039 100644 --- a/xfa/fxfa/parser/cxfa_fontinfo.h +++ b/xfa/fxfa/parser/cxfa_fontinfo.h @@ -11,7 +11,7 @@ class CXFA_FontInfo : public CXFA_Node { public: - CXFA_FontInfo(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_FontInfo(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_FontInfo() override; }; diff --git a/xfa/fxfa/parser/cxfa_form.cpp b/xfa/fxfa/parser/cxfa_form.cpp index b60dca634b..94068c4d2c 100644 --- a/xfa/fxfa/parser/cxfa_form.cpp +++ b/xfa/fxfa/parser/cxfa_form.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"form"; } // namespace -CXFA_Form::CXFA_Form(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Form::CXFA_Form(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Form, diff --git a/xfa/fxfa/parser/cxfa_form.h b/xfa/fxfa/parser/cxfa_form.h index e0600a1c06..39d1d90a40 100644 --- a/xfa/fxfa/parser/cxfa_form.h +++ b/xfa/fxfa/parser/cxfa_form.h @@ -11,7 +11,7 @@ class CXFA_Form : public CXFA_Node { public: - CXFA_Form(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Form(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Form() override; }; diff --git a/xfa/fxfa/parser/cxfa_format.cpp b/xfa/fxfa/parser/cxfa_format.cpp index 4546cf7c67..ba90772f43 100644 --- a/xfa/fxfa/parser/cxfa_format.cpp +++ b/xfa/fxfa/parser/cxfa_format.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"format"; } // namespace -CXFA_Format::CXFA_Format(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Format::CXFA_Format(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_format.h b/xfa/fxfa/parser/cxfa_format.h index 2de5ab30c5..3e31716062 100644 --- a/xfa/fxfa/parser/cxfa_format.h +++ b/xfa/fxfa/parser/cxfa_format.h @@ -11,7 +11,7 @@ class CXFA_Format : public CXFA_Node { public: - CXFA_Format(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Format(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Format() override; }; diff --git a/xfa/fxfa/parser/cxfa_formfieldfilling.cpp b/xfa/fxfa/parser/cxfa_formfieldfilling.cpp index 500cf11b5b..887e5cc398 100644 --- a/xfa/fxfa/parser/cxfa_formfieldfilling.cpp +++ b/xfa/fxfa/parser/cxfa_formfieldfilling.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"formFieldFilling"; } // namespace CXFA_FormFieldFilling::CXFA_FormFieldFilling(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_formfieldfilling.h b/xfa/fxfa/parser/cxfa_formfieldfilling.h index 65d4301a8e..77f1b8f59a 100644 --- a/xfa/fxfa/parser/cxfa_formfieldfilling.h +++ b/xfa/fxfa/parser/cxfa_formfieldfilling.h @@ -11,7 +11,7 @@ class CXFA_FormFieldFilling : public CXFA_Node { public: - CXFA_FormFieldFilling(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_FormFieldFilling(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_FormFieldFilling() override; }; diff --git a/xfa/fxfa/parser/cxfa_groupparent.cpp b/xfa/fxfa/parser/cxfa_groupparent.cpp index 1ae6cf7296..ca92d3ebb4 100644 --- a/xfa/fxfa/parser/cxfa_groupparent.cpp +++ b/xfa/fxfa/parser/cxfa_groupparent.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"groupParent"; } // namespace -CXFA_GroupParent::CXFA_GroupParent(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_GroupParent::CXFA_GroupParent(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_groupparent.h b/xfa/fxfa/parser/cxfa_groupparent.h index b56b78b2d4..7de296ce4e 100644 --- a/xfa/fxfa/parser/cxfa_groupparent.h +++ b/xfa/fxfa/parser/cxfa_groupparent.h @@ -11,7 +11,7 @@ class CXFA_GroupParent : public CXFA_Node { public: - CXFA_GroupParent(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_GroupParent(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_GroupParent() override; }; diff --git a/xfa/fxfa/parser/cxfa_handler.cpp b/xfa/fxfa/parser/cxfa_handler.cpp index 6750b8be6c..405fcd5969 100644 --- a/xfa/fxfa/parser/cxfa_handler.cpp +++ b/xfa/fxfa/parser/cxfa_handler.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"handler"; } // namespace -CXFA_Handler::CXFA_Handler(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Handler::CXFA_Handler(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_handler.h b/xfa/fxfa/parser/cxfa_handler.h index 6f18daf9cf..e575c0bc30 100644 --- a/xfa/fxfa/parser/cxfa_handler.h +++ b/xfa/fxfa/parser/cxfa_handler.h @@ -11,7 +11,7 @@ class CXFA_Handler : public CXFA_Node { public: - CXFA_Handler(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Handler(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Handler() override; }; diff --git a/xfa/fxfa/parser/cxfa_hostpseudomodel.cpp b/xfa/fxfa/parser/cxfa_hostpseudomodel.cpp index 6276bb99fc..af85c29142 100644 --- a/xfa/fxfa/parser/cxfa_hostpseudomodel.cpp +++ b/xfa/fxfa/parser/cxfa_hostpseudomodel.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"hostPseudoModel"; } // namespace CXFA_HostPseudoModel::CXFA_HostPseudoModel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_hostpseudomodel.h b/xfa/fxfa/parser/cxfa_hostpseudomodel.h index ba7b2271dd..8fabd53cff 100644 --- a/xfa/fxfa/parser/cxfa_hostpseudomodel.h +++ b/xfa/fxfa/parser/cxfa_hostpseudomodel.h @@ -11,7 +11,7 @@ class CXFA_HostPseudoModel : public CXFA_Node { public: - CXFA_HostPseudoModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_HostPseudoModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_HostPseudoModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_hyphenation.cpp b/xfa/fxfa/parser/cxfa_hyphenation.cpp index 1e7c8822b2..0e835ed723 100644 --- a/xfa/fxfa/parser/cxfa_hyphenation.cpp +++ b/xfa/fxfa/parser/cxfa_hyphenation.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"hyphenation"; } // namespace -CXFA_Hyphenation::CXFA_Hyphenation(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Hyphenation::CXFA_Hyphenation(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_hyphenation.h b/xfa/fxfa/parser/cxfa_hyphenation.h index f364c125e3..2601c5fa1d 100644 --- a/xfa/fxfa/parser/cxfa_hyphenation.h +++ b/xfa/fxfa/parser/cxfa_hyphenation.h @@ -11,7 +11,7 @@ class CXFA_Hyphenation : public CXFA_Node { public: - CXFA_Hyphenation(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Hyphenation(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Hyphenation() override; }; diff --git a/xfa/fxfa/parser/cxfa_ifempty.cpp b/xfa/fxfa/parser/cxfa_ifempty.cpp index 046899df53..ae612ef162 100644 --- a/xfa/fxfa/parser/cxfa_ifempty.cpp +++ b/xfa/fxfa/parser/cxfa_ifempty.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"ifEmpty"; } // namespace -CXFA_IfEmpty::CXFA_IfEmpty(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_IfEmpty::CXFA_IfEmpty(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_ifempty.h b/xfa/fxfa/parser/cxfa_ifempty.h index ed9860c7d2..3c3c1b47a9 100644 --- a/xfa/fxfa/parser/cxfa_ifempty.h +++ b/xfa/fxfa/parser/cxfa_ifempty.h @@ -11,7 +11,7 @@ class CXFA_IfEmpty : public CXFA_Node { public: - CXFA_IfEmpty(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_IfEmpty(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_IfEmpty() override; }; diff --git a/xfa/fxfa/parser/cxfa_image.cpp b/xfa/fxfa/parser/cxfa_image.cpp index 0e4bf44cfa..0bc82a6806 100644 --- a/xfa/fxfa/parser/cxfa_image.cpp +++ b/xfa/fxfa/parser/cxfa_image.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"image"; } // namespace -CXFA_Image::CXFA_Image(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Image::CXFA_Image(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_image.h b/xfa/fxfa/parser/cxfa_image.h index 41d4b67dd1..07ebf9d5d7 100644 --- a/xfa/fxfa/parser/cxfa_image.h +++ b/xfa/fxfa/parser/cxfa_image.h @@ -11,7 +11,7 @@ class CXFA_Image : public CXFA_Node { public: - CXFA_Image(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Image(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Image() override; }; diff --git a/xfa/fxfa/parser/cxfa_imageedit.cpp b/xfa/fxfa/parser/cxfa_imageedit.cpp index ce5ac5d419..937f3dc778 100644 --- a/xfa/fxfa/parser/cxfa_imageedit.cpp +++ b/xfa/fxfa/parser/cxfa_imageedit.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"imageEdit"; } // namespace -CXFA_ImageEdit::CXFA_ImageEdit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ImageEdit::CXFA_ImageEdit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_imageedit.h b/xfa/fxfa/parser/cxfa_imageedit.h index 616efe79ed..379750cd0f 100644 --- a/xfa/fxfa/parser/cxfa_imageedit.h +++ b/xfa/fxfa/parser/cxfa_imageedit.h @@ -11,7 +11,7 @@ class CXFA_ImageEdit : public CXFA_Node { public: - CXFA_ImageEdit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ImageEdit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ImageEdit() override; }; diff --git a/xfa/fxfa/parser/cxfa_includexdpcontent.cpp b/xfa/fxfa/parser/cxfa_includexdpcontent.cpp index daefdddb5f..dc887d3948 100644 --- a/xfa/fxfa/parser/cxfa_includexdpcontent.cpp +++ b/xfa/fxfa/parser/cxfa_includexdpcontent.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"includeXDPContent"; } // namespace CXFA_IncludeXDPContent::CXFA_IncludeXDPContent(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_includexdpcontent.h b/xfa/fxfa/parser/cxfa_includexdpcontent.h index 564dbba0f6..309a7c6ac6 100644 --- a/xfa/fxfa/parser/cxfa_includexdpcontent.h +++ b/xfa/fxfa/parser/cxfa_includexdpcontent.h @@ -11,7 +11,7 @@ class CXFA_IncludeXDPContent : public CXFA_Node { public: - CXFA_IncludeXDPContent(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_IncludeXDPContent(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_IncludeXDPContent() override; }; diff --git a/xfa/fxfa/parser/cxfa_incrementalload.cpp b/xfa/fxfa/parser/cxfa_incrementalload.cpp index 09be8aa66d..43ba0cb7ed 100644 --- a/xfa/fxfa/parser/cxfa_incrementalload.cpp +++ b/xfa/fxfa/parser/cxfa_incrementalload.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"incrementalLoad"; } // namespace CXFA_IncrementalLoad::CXFA_IncrementalLoad(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_incrementalload.h b/xfa/fxfa/parser/cxfa_incrementalload.h index d04884920e..9ea8f29d38 100644 --- a/xfa/fxfa/parser/cxfa_incrementalload.h +++ b/xfa/fxfa/parser/cxfa_incrementalload.h @@ -11,7 +11,7 @@ class CXFA_IncrementalLoad : public CXFA_Node { public: - CXFA_IncrementalLoad(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_IncrementalLoad(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_IncrementalLoad() override; }; diff --git a/xfa/fxfa/parser/cxfa_incrementalmerge.cpp b/xfa/fxfa/parser/cxfa_incrementalmerge.cpp index 7fa45c5edb..659dd2195f 100644 --- a/xfa/fxfa/parser/cxfa_incrementalmerge.cpp +++ b/xfa/fxfa/parser/cxfa_incrementalmerge.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"incrementalMerge"; } // namespace CXFA_IncrementalMerge::CXFA_IncrementalMerge(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_incrementalmerge.h b/xfa/fxfa/parser/cxfa_incrementalmerge.h index ae1bab1970..c8e655434d 100644 --- a/xfa/fxfa/parser/cxfa_incrementalmerge.h +++ b/xfa/fxfa/parser/cxfa_incrementalmerge.h @@ -11,7 +11,7 @@ class CXFA_IncrementalMerge : public CXFA_Node { public: - CXFA_IncrementalMerge(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_IncrementalMerge(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_IncrementalMerge() override; }; diff --git a/xfa/fxfa/parser/cxfa_insert.cpp b/xfa/fxfa/parser/cxfa_insert.cpp index cb971bcf88..42b21eb993 100644 --- a/xfa/fxfa/parser/cxfa_insert.cpp +++ b/xfa/fxfa/parser/cxfa_insert.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"insert"; } // namespace -CXFA_Insert::CXFA_Insert(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Insert::CXFA_Insert(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_insert.h b/xfa/fxfa/parser/cxfa_insert.h index b3d807f284..92579c3178 100644 --- a/xfa/fxfa/parser/cxfa_insert.h +++ b/xfa/fxfa/parser/cxfa_insert.h @@ -11,7 +11,7 @@ class CXFA_Insert : public CXFA_Node { public: - CXFA_Insert(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Insert(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Insert() override; }; diff --git a/xfa/fxfa/parser/cxfa_instancemanager.cpp b/xfa/fxfa/parser/cxfa_instancemanager.cpp index 89081ae393..bd37593440 100644 --- a/xfa/fxfa/parser/cxfa_instancemanager.cpp +++ b/xfa/fxfa/parser/cxfa_instancemanager.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"instanceManager"; } // namespace CXFA_InstanceManager::CXFA_InstanceManager(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Form, diff --git a/xfa/fxfa/parser/cxfa_instancemanager.h b/xfa/fxfa/parser/cxfa_instancemanager.h index 1fbe0a8b70..1910b92288 100644 --- a/xfa/fxfa/parser/cxfa_instancemanager.h +++ b/xfa/fxfa/parser/cxfa_instancemanager.h @@ -11,7 +11,7 @@ class CXFA_InstanceManager : public CXFA_Node { public: - CXFA_InstanceManager(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_InstanceManager(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_InstanceManager() override; }; diff --git a/xfa/fxfa/parser/cxfa_integer.cpp b/xfa/fxfa/parser/cxfa_integer.cpp index 0b465533cf..7f7b9a8626 100644 --- a/xfa/fxfa/parser/cxfa_integer.cpp +++ b/xfa/fxfa/parser/cxfa_integer.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"integer"; } // namespace -CXFA_Integer::CXFA_Integer(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Integer::CXFA_Integer(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_integer.h b/xfa/fxfa/parser/cxfa_integer.h index 2f412b82de..2e5631d3a1 100644 --- a/xfa/fxfa/parser/cxfa_integer.h +++ b/xfa/fxfa/parser/cxfa_integer.h @@ -11,7 +11,7 @@ class CXFA_Integer : public CXFA_Node { public: - CXFA_Integer(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Integer(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Integer() override; }; diff --git a/xfa/fxfa/parser/cxfa_interactive.cpp b/xfa/fxfa/parser/cxfa_interactive.cpp index f01a7ad6aa..e68d957c99 100644 --- a/xfa/fxfa/parser/cxfa_interactive.cpp +++ b/xfa/fxfa/parser/cxfa_interactive.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"interactive"; } // namespace -CXFA_Interactive::CXFA_Interactive(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Interactive::CXFA_Interactive(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_interactive.h b/xfa/fxfa/parser/cxfa_interactive.h index 64f9d313d4..69f2918dee 100644 --- a/xfa/fxfa/parser/cxfa_interactive.h +++ b/xfa/fxfa/parser/cxfa_interactive.h @@ -11,7 +11,7 @@ class CXFA_Interactive : public CXFA_Node { public: - CXFA_Interactive(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Interactive(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Interactive() override; }; diff --git a/xfa/fxfa/parser/cxfa_issuers.cpp b/xfa/fxfa/parser/cxfa_issuers.cpp index e07eb05fc3..b6909d4be8 100644 --- a/xfa/fxfa/parser/cxfa_issuers.cpp +++ b/xfa/fxfa/parser/cxfa_issuers.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"issuers"; } // namespace -CXFA_Issuers::CXFA_Issuers(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Issuers::CXFA_Issuers(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_issuers.h b/xfa/fxfa/parser/cxfa_issuers.h index d131bbb27a..6b94f15e8c 100644 --- a/xfa/fxfa/parser/cxfa_issuers.h +++ b/xfa/fxfa/parser/cxfa_issuers.h @@ -11,7 +11,7 @@ class CXFA_Issuers : public CXFA_Node { public: - CXFA_Issuers(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Issuers(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Issuers() override; }; diff --git a/xfa/fxfa/parser/cxfa_items.cpp b/xfa/fxfa/parser/cxfa_items.cpp index 6a077037a1..833e284777 100644 --- a/xfa/fxfa/parser/cxfa_items.cpp +++ b/xfa/fxfa/parser/cxfa_items.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"items"; } // namespace -CXFA_Items::CXFA_Items(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Items::CXFA_Items(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_items.h b/xfa/fxfa/parser/cxfa_items.h index e480167c47..586fabdeca 100644 --- a/xfa/fxfa/parser/cxfa_items.h +++ b/xfa/fxfa/parser/cxfa_items.h @@ -11,7 +11,7 @@ class CXFA_Items : public CXFA_Node { public: - CXFA_Items(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Items(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Items() override; }; diff --git a/xfa/fxfa/parser/cxfa_jog.cpp b/xfa/fxfa/parser/cxfa_jog.cpp index 1c8a883d99..3735e2f992 100644 --- a/xfa/fxfa/parser/cxfa_jog.cpp +++ b/xfa/fxfa/parser/cxfa_jog.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"jog"; } // namespace -CXFA_Jog::CXFA_Jog(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Jog::CXFA_Jog(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_jog.h b/xfa/fxfa/parser/cxfa_jog.h index d7b2d71c75..266ccd1fd4 100644 --- a/xfa/fxfa/parser/cxfa_jog.h +++ b/xfa/fxfa/parser/cxfa_jog.h @@ -11,7 +11,7 @@ class CXFA_Jog : public CXFA_Node { public: - CXFA_Jog(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Jog(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Jog() override; }; diff --git a/xfa/fxfa/parser/cxfa_keep.cpp b/xfa/fxfa/parser/cxfa_keep.cpp index 51fb946e3e..c72592b65f 100644 --- a/xfa/fxfa/parser/cxfa_keep.cpp +++ b/xfa/fxfa/parser/cxfa_keep.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"keep"; } // namespace -CXFA_Keep::CXFA_Keep(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Keep::CXFA_Keep(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_keep.h b/xfa/fxfa/parser/cxfa_keep.h index 9e6339817a..7d53f9634a 100644 --- a/xfa/fxfa/parser/cxfa_keep.h +++ b/xfa/fxfa/parser/cxfa_keep.h @@ -11,7 +11,7 @@ class CXFA_Keep : public CXFA_Node { public: - CXFA_Keep(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Keep(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Keep() override; }; diff --git a/xfa/fxfa/parser/cxfa_keyusage.cpp b/xfa/fxfa/parser/cxfa_keyusage.cpp index c24435e88a..269a58cd7c 100644 --- a/xfa/fxfa/parser/cxfa_keyusage.cpp +++ b/xfa/fxfa/parser/cxfa_keyusage.cpp @@ -29,7 +29,7 @@ constexpr wchar_t kName[] = L"keyUsage"; } // namespace -CXFA_KeyUsage::CXFA_KeyUsage(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_KeyUsage::CXFA_KeyUsage(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_keyusage.h b/xfa/fxfa/parser/cxfa_keyusage.h index e12de37f15..b25807411b 100644 --- a/xfa/fxfa/parser/cxfa_keyusage.h +++ b/xfa/fxfa/parser/cxfa_keyusage.h @@ -11,7 +11,7 @@ class CXFA_KeyUsage : public CXFA_Node { public: - CXFA_KeyUsage(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_KeyUsage(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_KeyUsage() override; }; diff --git a/xfa/fxfa/parser/cxfa_labelprinter.cpp b/xfa/fxfa/parser/cxfa_labelprinter.cpp index 55ac1ffec7..0520cb6023 100644 --- a/xfa/fxfa/parser/cxfa_labelprinter.cpp +++ b/xfa/fxfa/parser/cxfa_labelprinter.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"labelPrinter"; } // namespace -CXFA_LabelPrinter::CXFA_LabelPrinter(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_LabelPrinter::CXFA_LabelPrinter(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_labelprinter.h b/xfa/fxfa/parser/cxfa_labelprinter.h index 75283114b6..e3f5d3bf75 100644 --- a/xfa/fxfa/parser/cxfa_labelprinter.h +++ b/xfa/fxfa/parser/cxfa_labelprinter.h @@ -11,7 +11,7 @@ class CXFA_LabelPrinter : public CXFA_Node { public: - CXFA_LabelPrinter(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_LabelPrinter(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_LabelPrinter() override; }; diff --git a/xfa/fxfa/parser/cxfa_layout.cpp b/xfa/fxfa/parser/cxfa_layout.cpp index 3625061b65..bc2933f595 100644 --- a/xfa/fxfa/parser/cxfa_layout.cpp +++ b/xfa/fxfa/parser/cxfa_layout.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"layout"; } // namespace -CXFA_Layout::CXFA_Layout(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Layout::CXFA_Layout(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_layout.h b/xfa/fxfa/parser/cxfa_layout.h index 64ba8de1d2..93e069e163 100644 --- a/xfa/fxfa/parser/cxfa_layout.h +++ b/xfa/fxfa/parser/cxfa_layout.h @@ -11,7 +11,7 @@ class CXFA_Layout : public CXFA_Node { public: - CXFA_Layout(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Layout(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Layout() override; }; diff --git a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp index e0678c498f..70d5f46856 100644 --- a/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp +++ b/xfa/fxfa/parser/cxfa_layoutpagemgr.cpp @@ -310,7 +310,7 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { CXFA_Document* pDocument = pTemplateNode->GetDocument(); pPageArea = m_pTemplatePageSetRoot->GetChild(0, XFA_Element::PageArea, false); if (!pPageArea) { - pPageArea = pDocument->CreateNode(m_pTemplatePageSetRoot->GetPacketID(), + pPageArea = pDocument->CreateNode(m_pTemplatePageSetRoot->GetPacketType(), XFA_Element::PageArea); if (!pPageArea) return false; @@ -321,7 +321,7 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { CXFA_Node* pContentArea = pPageArea->GetChild(0, XFA_Element::ContentArea, false); if (!pContentArea) { - pContentArea = pDocument->CreateNode(pPageArea->GetPacketID(), + pContentArea = pDocument->CreateNode(pPageArea->GetPacketType(), XFA_Element::ContentArea); if (!pContentArea) return false; @@ -340,7 +340,7 @@ bool CXFA_LayoutPageMgr::InitLayoutPage(CXFA_Node* pFormNode) { CXFA_Node* pMedium = pPageArea->GetChild(0, XFA_Element::Medium, false); if (!pMedium) { pMedium = - pDocument->CreateNode(pPageArea->GetPacketID(), XFA_Element::Medium); + pDocument->CreateNode(pPageArea->GetPacketType(), XFA_Element::Medium); if (!pContentArea) return false; @@ -1721,8 +1721,8 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { iIndex++; } if (!pPendingPageSet) { - if (pRootPageSetContainerItem->m_pFormNode->GetPacketID() == - XFA_XDPPACKET_Template) { + if (pRootPageSetContainerItem->m_pFormNode->GetPacketType() == + XFA_PacketType::Template) { pPendingPageSet = pRootPageSetContainerItem->m_pFormNode->CloneTemplateToForm(false); } else { @@ -1738,7 +1738,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { for (CXFA_ContainerLayoutItem* pContainerItem = iterator.MoveToNext(); pContainerItem; pContainerItem = iterator.MoveToNext()) { CXFA_Node* pNode = pContainerItem->m_pFormNode; - if (pNode->GetPacketID() != XFA_XDPPACKET_Template) + if (pNode->GetPacketType() != XFA_PacketType::Template) continue; switch (pNode->GetElementType()) { @@ -1980,7 +1980,7 @@ void CXFA_LayoutPageMgr::PrepareLayout() { CXFA_ContainerLayoutItem* pRootLayoutItem = m_pPageSetLayoutItemRoot; if (pRootLayoutItem && - pRootLayoutItem->m_pFormNode->GetPacketID() == XFA_XDPPACKET_Form) { + pRootLayoutItem->m_pFormNode->GetPacketType() == XFA_PacketType::Form) { CXFA_Node* pPageSetFormNode = pRootLayoutItem->m_pFormNode; pRootLayoutItem->m_pFormNode->GetDocument()->m_pPendingPageSet.clear(); if (pPageSetFormNode->HasRemovedChildren()) { diff --git a/xfa/fxfa/parser/cxfa_layoutpseudomodel.cpp b/xfa/fxfa/parser/cxfa_layoutpseudomodel.cpp index df9583108a..cdf092d832 100644 --- a/xfa/fxfa/parser/cxfa_layoutpseudomodel.cpp +++ b/xfa/fxfa/parser/cxfa_layoutpseudomodel.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"layoutPseudoModel"; } // namespace CXFA_LayoutPseudoModel::CXFA_LayoutPseudoModel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_layoutpseudomodel.h b/xfa/fxfa/parser/cxfa_layoutpseudomodel.h index 8bd46ece15..8ffa4bba25 100644 --- a/xfa/fxfa/parser/cxfa_layoutpseudomodel.h +++ b/xfa/fxfa/parser/cxfa_layoutpseudomodel.h @@ -11,7 +11,7 @@ class CXFA_LayoutPseudoModel : public CXFA_Node { public: - CXFA_LayoutPseudoModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_LayoutPseudoModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_LayoutPseudoModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_level.cpp b/xfa/fxfa/parser/cxfa_level.cpp index 98a52f6624..7343805dfb 100644 --- a/xfa/fxfa/parser/cxfa_level.cpp +++ b/xfa/fxfa/parser/cxfa_level.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"level"; } // namespace -CXFA_Level::CXFA_Level(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Level::CXFA_Level(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_level.h b/xfa/fxfa/parser/cxfa_level.h index 512b1b98c7..abdd048232 100644 --- a/xfa/fxfa/parser/cxfa_level.h +++ b/xfa/fxfa/parser/cxfa_level.h @@ -11,7 +11,7 @@ class CXFA_Level : public CXFA_Node { public: - CXFA_Level(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Level(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Level() override; }; diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_line.cpp index 85e41ed36f..e517cbb55d 100644 --- a/xfa/fxfa/parser/cxfa_line.cpp +++ b/xfa/fxfa/parser/cxfa_line.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"line"; } // namespace -CXFA_Line::CXFA_Line(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Line::CXFA_Line(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_line.h b/xfa/fxfa/parser/cxfa_line.h index c575c5ee2b..9126db0161 100644 --- a/xfa/fxfa/parser/cxfa_line.h +++ b/xfa/fxfa/parser/cxfa_line.h @@ -11,7 +11,7 @@ class CXFA_Line : public CXFA_Node { public: - CXFA_Line(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Line(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Line() override; }; diff --git a/xfa/fxfa/parser/cxfa_linear.cpp b/xfa/fxfa/parser/cxfa_linear.cpp index f4d5ba908a..c92598f1fd 100644 --- a/xfa/fxfa/parser/cxfa_linear.cpp +++ b/xfa/fxfa/parser/cxfa_linear.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"linear"; } // namespace -CXFA_Linear::CXFA_Linear(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Linear::CXFA_Linear(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_linear.h b/xfa/fxfa/parser/cxfa_linear.h index e3572b0079..af1b8e8a28 100644 --- a/xfa/fxfa/parser/cxfa_linear.h +++ b/xfa/fxfa/parser/cxfa_linear.h @@ -11,7 +11,7 @@ class CXFA_Linear : public CXFA_Node { public: - CXFA_Linear(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Linear(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Linear() override; }; diff --git a/xfa/fxfa/parser/cxfa_linearized.cpp b/xfa/fxfa/parser/cxfa_linearized.cpp index 507ed29588..0ae6b8dbcc 100644 --- a/xfa/fxfa/parser/cxfa_linearized.cpp +++ b/xfa/fxfa/parser/cxfa_linearized.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"linearized"; } // namespace -CXFA_Linearized::CXFA_Linearized(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Linearized::CXFA_Linearized(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_linearized.h b/xfa/fxfa/parser/cxfa_linearized.h index 59f41fe3c6..df7846e0a8 100644 --- a/xfa/fxfa/parser/cxfa_linearized.h +++ b/xfa/fxfa/parser/cxfa_linearized.h @@ -11,7 +11,7 @@ class CXFA_Linearized : public CXFA_Node { public: - CXFA_Linearized(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Linearized(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Linearized() override; }; diff --git a/xfa/fxfa/parser/cxfa_list.cpp b/xfa/fxfa/parser/cxfa_list.cpp index 9c15b578c3..4f8c1c8e1f 100644 --- a/xfa/fxfa/parser/cxfa_list.cpp +++ b/xfa/fxfa/parser/cxfa_list.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"list"; } // namespace -CXFA_List::CXFA_List(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_List::CXFA_List(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_list.h b/xfa/fxfa/parser/cxfa_list.h index 8c54a983d1..c2829352cc 100644 --- a/xfa/fxfa/parser/cxfa_list.h +++ b/xfa/fxfa/parser/cxfa_list.h @@ -11,7 +11,7 @@ class CXFA_List : public CXFA_Node { public: - CXFA_List(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_List(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_List() override; }; diff --git a/xfa/fxfa/parser/cxfa_locale.cpp b/xfa/fxfa/parser/cxfa_locale.cpp index a60fba2a91..c601139dce 100644 --- a/xfa/fxfa/parser/cxfa_locale.cpp +++ b/xfa/fxfa/parser/cxfa_locale.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"locale"; } // namespace -CXFA_Locale::CXFA_Locale(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Locale::CXFA_Locale(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet), diff --git a/xfa/fxfa/parser/cxfa_locale.h b/xfa/fxfa/parser/cxfa_locale.h index 4071d3354e..3a7e83dc70 100644 --- a/xfa/fxfa/parser/cxfa_locale.h +++ b/xfa/fxfa/parser/cxfa_locale.h @@ -11,7 +11,7 @@ class CXFA_Locale : public CXFA_Node { public: - CXFA_Locale(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Locale(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Locale() override; }; diff --git a/xfa/fxfa/parser/cxfa_localeset.cpp b/xfa/fxfa/parser/cxfa_localeset.cpp index 86c2d21cf1..b669e3b108 100644 --- a/xfa/fxfa/parser/cxfa_localeset.cpp +++ b/xfa/fxfa/parser/cxfa_localeset.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"localeSet"; } // namespace -CXFA_LocaleSet::CXFA_LocaleSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_LocaleSet::CXFA_LocaleSet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet), diff --git a/xfa/fxfa/parser/cxfa_localeset.h b/xfa/fxfa/parser/cxfa_localeset.h index 3a392cdf5f..1d65ad11dc 100644 --- a/xfa/fxfa/parser/cxfa_localeset.h +++ b/xfa/fxfa/parser/cxfa_localeset.h @@ -11,7 +11,7 @@ class CXFA_LocaleSet : public CXFA_Node { public: - CXFA_LocaleSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_LocaleSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_LocaleSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_lockdocument.cpp b/xfa/fxfa/parser/cxfa_lockdocument.cpp index ea015e56d4..2b09736197 100644 --- a/xfa/fxfa/parser/cxfa_lockdocument.cpp +++ b/xfa/fxfa/parser/cxfa_lockdocument.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"lockDocument"; } // namespace -CXFA_LockDocument::CXFA_LockDocument(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_LockDocument::CXFA_LockDocument(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_lockdocument.h b/xfa/fxfa/parser/cxfa_lockdocument.h index c5321c8980..025031ad7f 100644 --- a/xfa/fxfa/parser/cxfa_lockdocument.h +++ b/xfa/fxfa/parser/cxfa_lockdocument.h @@ -11,7 +11,7 @@ class CXFA_LockDocument : public CXFA_Node { public: - CXFA_LockDocument(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_LockDocument(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_LockDocument() override; }; diff --git a/xfa/fxfa/parser/cxfa_log.cpp b/xfa/fxfa/parser/cxfa_log.cpp index 79aac1a3e3..38651cb719 100644 --- a/xfa/fxfa/parser/cxfa_log.cpp +++ b/xfa/fxfa/parser/cxfa_log.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"log"; } // namespace -CXFA_Log::CXFA_Log(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Log::CXFA_Log(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_log.h b/xfa/fxfa/parser/cxfa_log.h index 2add392979..17fd290f47 100644 --- a/xfa/fxfa/parser/cxfa_log.h +++ b/xfa/fxfa/parser/cxfa_log.h @@ -11,7 +11,7 @@ class CXFA_Log : public CXFA_Node { public: - CXFA_Log(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Log(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Log() override; }; diff --git a/xfa/fxfa/parser/cxfa_logpseudomodel.cpp b/xfa/fxfa/parser/cxfa_logpseudomodel.cpp index ed883762e2..c8db05c476 100644 --- a/xfa/fxfa/parser/cxfa_logpseudomodel.cpp +++ b/xfa/fxfa/parser/cxfa_logpseudomodel.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"logPseudoModel"; } // namespace CXFA_LogPseudoModel::CXFA_LogPseudoModel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_logpseudomodel.h b/xfa/fxfa/parser/cxfa_logpseudomodel.h index 3b1b0e1189..7d24c42dc7 100644 --- a/xfa/fxfa/parser/cxfa_logpseudomodel.h +++ b/xfa/fxfa/parser/cxfa_logpseudomodel.h @@ -11,7 +11,7 @@ class CXFA_LogPseudoModel : public CXFA_Node { public: - CXFA_LogPseudoModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_LogPseudoModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_LogPseudoModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_manifest.cpp b/xfa/fxfa/parser/cxfa_manifest.cpp index 0d278a24af..2406160bae 100644 --- a/xfa/fxfa/parser/cxfa_manifest.cpp +++ b/xfa/fxfa/parser/cxfa_manifest.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"manifest"; } // namespace -CXFA_Manifest::CXFA_Manifest(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Manifest::CXFA_Manifest(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_manifest.h b/xfa/fxfa/parser/cxfa_manifest.h index 603df54dbf..a13cdacfae 100644 --- a/xfa/fxfa/parser/cxfa_manifest.h +++ b/xfa/fxfa/parser/cxfa_manifest.h @@ -11,7 +11,7 @@ class CXFA_Manifest : public CXFA_Node { public: - CXFA_Manifest(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Manifest(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Manifest() override; }; diff --git a/xfa/fxfa/parser/cxfa_map.cpp b/xfa/fxfa/parser/cxfa_map.cpp index 6fd384ad86..adcb879e9e 100644 --- a/xfa/fxfa/parser/cxfa_map.cpp +++ b/xfa/fxfa/parser/cxfa_map.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"map"; } // namespace -CXFA_Map::CXFA_Map(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Map::CXFA_Map(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Config | XFA_XDPPACKET_SourceSet), diff --git a/xfa/fxfa/parser/cxfa_map.h b/xfa/fxfa/parser/cxfa_map.h index b4535c24f9..c49568f9ce 100644 --- a/xfa/fxfa/parser/cxfa_map.h +++ b/xfa/fxfa/parser/cxfa_map.h @@ -11,7 +11,7 @@ class CXFA_Map : public CXFA_Node { public: - CXFA_Map(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Map(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Map() override; }; diff --git a/xfa/fxfa/parser/cxfa_margin.cpp b/xfa/fxfa/parser/cxfa_margin.cpp index 367d6ee125..6ad52c1485 100644 --- a/xfa/fxfa/parser/cxfa_margin.cpp +++ b/xfa/fxfa/parser/cxfa_margin.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"margin"; } // namespace -CXFA_Margin::CXFA_Margin(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Margin::CXFA_Margin(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_margin.h b/xfa/fxfa/parser/cxfa_margin.h index 9883e67047..3ac7657d17 100644 --- a/xfa/fxfa/parser/cxfa_margin.h +++ b/xfa/fxfa/parser/cxfa_margin.h @@ -11,7 +11,7 @@ class CXFA_Margin : public CXFA_Node { public: - CXFA_Margin(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Margin(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Margin() override; }; diff --git a/xfa/fxfa/parser/cxfa_mdp.cpp b/xfa/fxfa/parser/cxfa_mdp.cpp index 655b36a162..a3703c39f3 100644 --- a/xfa/fxfa/parser/cxfa_mdp.cpp +++ b/xfa/fxfa/parser/cxfa_mdp.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"mdp"; } // namespace -CXFA_Mdp::CXFA_Mdp(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Mdp::CXFA_Mdp(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_mdp.h b/xfa/fxfa/parser/cxfa_mdp.h index a802b1607f..0ae626d557 100644 --- a/xfa/fxfa/parser/cxfa_mdp.h +++ b/xfa/fxfa/parser/cxfa_mdp.h @@ -11,7 +11,7 @@ class CXFA_Mdp : public CXFA_Node { public: - CXFA_Mdp(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Mdp(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Mdp() override; }; diff --git a/xfa/fxfa/parser/cxfa_medium.cpp b/xfa/fxfa/parser/cxfa_medium.cpp index db0c492440..a124dab6e0 100644 --- a/xfa/fxfa/parser/cxfa_medium.cpp +++ b/xfa/fxfa/parser/cxfa_medium.cpp @@ -28,7 +28,7 @@ constexpr wchar_t kName[] = L"medium"; } // namespace -CXFA_Medium::CXFA_Medium(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Medium::CXFA_Medium(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_medium.h b/xfa/fxfa/parser/cxfa_medium.h index 4b5b5401cf..b9b9c5d848 100644 --- a/xfa/fxfa/parser/cxfa_medium.h +++ b/xfa/fxfa/parser/cxfa_medium.h @@ -11,7 +11,7 @@ class CXFA_Medium : public CXFA_Node { public: - CXFA_Medium(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Medium(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Medium() override; }; diff --git a/xfa/fxfa/parser/cxfa_mediuminfo.cpp b/xfa/fxfa/parser/cxfa_mediuminfo.cpp index d24f889ecf..9a41f1dde3 100644 --- a/xfa/fxfa/parser/cxfa_mediuminfo.cpp +++ b/xfa/fxfa/parser/cxfa_mediuminfo.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"mediumInfo"; } // namespace -CXFA_MediumInfo::CXFA_MediumInfo(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_MediumInfo::CXFA_MediumInfo(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_mediuminfo.h b/xfa/fxfa/parser/cxfa_mediuminfo.h index 11d72b3978..da100eaec2 100644 --- a/xfa/fxfa/parser/cxfa_mediuminfo.h +++ b/xfa/fxfa/parser/cxfa_mediuminfo.h @@ -11,7 +11,7 @@ class CXFA_MediumInfo : public CXFA_Node { public: - CXFA_MediumInfo(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_MediumInfo(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_MediumInfo() override; }; diff --git a/xfa/fxfa/parser/cxfa_meridiem.cpp b/xfa/fxfa/parser/cxfa_meridiem.cpp index 89227f631e..357ce2c275 100644 --- a/xfa/fxfa/parser/cxfa_meridiem.cpp +++ b/xfa/fxfa/parser/cxfa_meridiem.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"meridiem"; } // namespace -CXFA_Meridiem::CXFA_Meridiem(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Meridiem::CXFA_Meridiem(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_meridiem.h b/xfa/fxfa/parser/cxfa_meridiem.h index 0c3935cd94..30bd4b06cc 100644 --- a/xfa/fxfa/parser/cxfa_meridiem.h +++ b/xfa/fxfa/parser/cxfa_meridiem.h @@ -11,7 +11,7 @@ class CXFA_Meridiem : public CXFA_Node { public: - CXFA_Meridiem(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Meridiem(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Meridiem() override; }; diff --git a/xfa/fxfa/parser/cxfa_meridiemnames.cpp b/xfa/fxfa/parser/cxfa_meridiemnames.cpp index aad222a8f5..dfb603ef4b 100644 --- a/xfa/fxfa/parser/cxfa_meridiemnames.cpp +++ b/xfa/fxfa/parser/cxfa_meridiemnames.cpp @@ -15,7 +15,8 @@ constexpr wchar_t kName[] = L"meridiemNames"; } // namespace -CXFA_MeridiemNames::CXFA_MeridiemNames(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_MeridiemNames::CXFA_MeridiemNames(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_meridiemnames.h b/xfa/fxfa/parser/cxfa_meridiemnames.h index d98761f113..8cade217e4 100644 --- a/xfa/fxfa/parser/cxfa_meridiemnames.h +++ b/xfa/fxfa/parser/cxfa_meridiemnames.h @@ -11,7 +11,7 @@ class CXFA_MeridiemNames : public CXFA_Node { public: - CXFA_MeridiemNames(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_MeridiemNames(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_MeridiemNames() override; }; diff --git a/xfa/fxfa/parser/cxfa_message.cpp b/xfa/fxfa/parser/cxfa_message.cpp index d68f472fdb..4863e30bcd 100644 --- a/xfa/fxfa/parser/cxfa_message.cpp +++ b/xfa/fxfa/parser/cxfa_message.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"message"; } // namespace -CXFA_Message::CXFA_Message(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Message::CXFA_Message(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_message.h b/xfa/fxfa/parser/cxfa_message.h index 00ab899c12..f172e061a3 100644 --- a/xfa/fxfa/parser/cxfa_message.h +++ b/xfa/fxfa/parser/cxfa_message.h @@ -11,7 +11,7 @@ class CXFA_Message : public CXFA_Node { public: - CXFA_Message(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Message(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Message() override; }; diff --git a/xfa/fxfa/parser/cxfa_messaging.cpp b/xfa/fxfa/parser/cxfa_messaging.cpp index a89e44c4a5..8ad77a4019 100644 --- a/xfa/fxfa/parser/cxfa_messaging.cpp +++ b/xfa/fxfa/parser/cxfa_messaging.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"messaging"; } // namespace -CXFA_Messaging::CXFA_Messaging(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Messaging::CXFA_Messaging(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_messaging.h b/xfa/fxfa/parser/cxfa_messaging.h index 266c345303..48d16b3b9a 100644 --- a/xfa/fxfa/parser/cxfa_messaging.h +++ b/xfa/fxfa/parser/cxfa_messaging.h @@ -11,7 +11,7 @@ class CXFA_Messaging : public CXFA_Node { public: - CXFA_Messaging(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Messaging(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Messaging() override; }; diff --git a/xfa/fxfa/parser/cxfa_mode.cpp b/xfa/fxfa/parser/cxfa_mode.cpp index 46ddbb28e7..6195f087ac 100644 --- a/xfa/fxfa/parser/cxfa_mode.cpp +++ b/xfa/fxfa/parser/cxfa_mode.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"mode"; } // namespace -CXFA_Mode::CXFA_Mode(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Mode::CXFA_Mode(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_mode.h b/xfa/fxfa/parser/cxfa_mode.h index 3385061a5a..1dfd426d98 100644 --- a/xfa/fxfa/parser/cxfa_mode.h +++ b/xfa/fxfa/parser/cxfa_mode.h @@ -11,7 +11,7 @@ class CXFA_Mode : public CXFA_Node { public: - CXFA_Mode(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Mode(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Mode() override; }; diff --git a/xfa/fxfa/parser/cxfa_modifyannots.cpp b/xfa/fxfa/parser/cxfa_modifyannots.cpp index 3901042106..e349dbfd1a 100644 --- a/xfa/fxfa/parser/cxfa_modifyannots.cpp +++ b/xfa/fxfa/parser/cxfa_modifyannots.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"modifyAnnots"; } // namespace -CXFA_ModifyAnnots::CXFA_ModifyAnnots(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ModifyAnnots::CXFA_ModifyAnnots(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_modifyannots.h b/xfa/fxfa/parser/cxfa_modifyannots.h index 601a7a3f1e..4e10921cca 100644 --- a/xfa/fxfa/parser/cxfa_modifyannots.h +++ b/xfa/fxfa/parser/cxfa_modifyannots.h @@ -11,7 +11,7 @@ class CXFA_ModifyAnnots : public CXFA_Node { public: - CXFA_ModifyAnnots(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ModifyAnnots(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ModifyAnnots() override; }; diff --git a/xfa/fxfa/parser/cxfa_month.cpp b/xfa/fxfa/parser/cxfa_month.cpp index 94b9dc0c47..687ef4a20c 100644 --- a/xfa/fxfa/parser/cxfa_month.cpp +++ b/xfa/fxfa/parser/cxfa_month.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"month"; } // namespace -CXFA_Month::CXFA_Month(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Month::CXFA_Month(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_month.h b/xfa/fxfa/parser/cxfa_month.h index 1936612a6d..69361f540c 100644 --- a/xfa/fxfa/parser/cxfa_month.h +++ b/xfa/fxfa/parser/cxfa_month.h @@ -11,7 +11,7 @@ class CXFA_Month : public CXFA_Node { public: - CXFA_Month(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Month(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Month() override; }; diff --git a/xfa/fxfa/parser/cxfa_monthnames.cpp b/xfa/fxfa/parser/cxfa_monthnames.cpp index 96f22df524..1b05b0dcf8 100644 --- a/xfa/fxfa/parser/cxfa_monthnames.cpp +++ b/xfa/fxfa/parser/cxfa_monthnames.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"monthNames"; } // namespace -CXFA_MonthNames::CXFA_MonthNames(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_MonthNames::CXFA_MonthNames(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_monthnames.h b/xfa/fxfa/parser/cxfa_monthnames.h index 9b221d6cb3..f95512b3aa 100644 --- a/xfa/fxfa/parser/cxfa_monthnames.h +++ b/xfa/fxfa/parser/cxfa_monthnames.h @@ -11,7 +11,7 @@ class CXFA_MonthNames : public CXFA_Node { public: - CXFA_MonthNames(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_MonthNames(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_MonthNames() override; }; diff --git a/xfa/fxfa/parser/cxfa_msgid.cpp b/xfa/fxfa/parser/cxfa_msgid.cpp index 4be43f1480..626833b6fd 100644 --- a/xfa/fxfa/parser/cxfa_msgid.cpp +++ b/xfa/fxfa/parser/cxfa_msgid.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"msgId"; } // namespace -CXFA_MsgId::CXFA_MsgId(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_MsgId::CXFA_MsgId(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_msgid.h b/xfa/fxfa/parser/cxfa_msgid.h index c8d30d6772..333085a37b 100644 --- a/xfa/fxfa/parser/cxfa_msgid.h +++ b/xfa/fxfa/parser/cxfa_msgid.h @@ -11,7 +11,7 @@ class CXFA_MsgId : public CXFA_Node { public: - CXFA_MsgId(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_MsgId(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_MsgId() override; }; diff --git a/xfa/fxfa/parser/cxfa_nameattr.cpp b/xfa/fxfa/parser/cxfa_nameattr.cpp index 4217c13d21..dd42694ce5 100644 --- a/xfa/fxfa/parser/cxfa_nameattr.cpp +++ b/xfa/fxfa/parser/cxfa_nameattr.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"nameAttr"; } // namespace -CXFA_NameAttr::CXFA_NameAttr(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NameAttr::CXFA_NameAttr(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_nameattr.h b/xfa/fxfa/parser/cxfa_nameattr.h index bcd02327d6..05514c020b 100644 --- a/xfa/fxfa/parser/cxfa_nameattr.h +++ b/xfa/fxfa/parser/cxfa_nameattr.h @@ -11,7 +11,7 @@ class CXFA_NameAttr : public CXFA_Node { public: - CXFA_NameAttr(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NameAttr(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NameAttr() override; }; diff --git a/xfa/fxfa/parser/cxfa_neverembed.cpp b/xfa/fxfa/parser/cxfa_neverembed.cpp index 10f4dd6739..7ba64a7dca 100644 --- a/xfa/fxfa/parser/cxfa_neverembed.cpp +++ b/xfa/fxfa/parser/cxfa_neverembed.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"neverEmbed"; } // namespace -CXFA_NeverEmbed::CXFA_NeverEmbed(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NeverEmbed::CXFA_NeverEmbed(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_neverembed.h b/xfa/fxfa/parser/cxfa_neverembed.h index 8be160f00a..11ec928339 100644 --- a/xfa/fxfa/parser/cxfa_neverembed.h +++ b/xfa/fxfa/parser/cxfa_neverembed.h @@ -11,7 +11,7 @@ class CXFA_NeverEmbed : public CXFA_Node { public: - CXFA_NeverEmbed(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NeverEmbed(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NeverEmbed() override; }; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index c8e226633b..ff0a60172f 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -157,7 +157,7 @@ pdfium::Optional<XFA_ATTRIBUTEENUM> CXFA_Node::NameToAttributeEnum( } CXFA_Node::CXFA_Node(CXFA_Document* pDoc, - XFA_XDPPACKET ePacket, + XFA_PacketType ePacket, uint32_t validPackets, XFA_ObjectType oType, XFA_Element eType, @@ -429,7 +429,7 @@ std::vector<CXFA_Node*> CXFA_Node::GetNodeList(uint32_t dwTypeFilter, if (!property) return nodes; - CXFA_Node* pNewNode = m_pDocument->CreateNode(GetPacketID(), *property); + CXFA_Node* pNewNode = m_pDocument->CreateNode(GetPacketType(), *property); if (pNewNode) { InsertChild(pNewNode, nullptr); pNewNode->SetFlag(XFA_NodeFlag_Initialized, true); @@ -445,9 +445,9 @@ CXFA_Node* CXFA_Node::CreateSamePacketNode(XFA_Element eType) { } CXFA_Node* CXFA_Node::CloneTemplateToForm(bool bRecursive) { - ASSERT(m_ePacket == XFA_XDPPACKET_Template); + ASSERT(m_ePacket == XFA_PacketType::Template); CXFA_Node* pClone = - m_pDocument->CreateNode(XFA_XDPPACKET_Form, m_elementType); + m_pDocument->CreateNode(XFA_PacketType::Form, m_elementType); if (!pClone) return nullptr; @@ -473,7 +473,7 @@ void CXFA_Node::SetTemplateNode(CXFA_Node* pTemplateNode) { } CXFA_Node* CXFA_Node::GetBindData() { - ASSERT(GetPacketID() == XFA_XDPPACKET_Form); + ASSERT(GetPacketType() == XFA_PacketType::Form); return JSNode()->GetBindingNode(); } @@ -542,7 +542,8 @@ int32_t CXFA_Node::RemoveBindItem(CXFA_Node* pFormNode) { } bool CXFA_Node::HasBindItem() { - return GetPacketID() == XFA_XDPPACKET_Datasets && JSNode()->GetBindingNode(); + return GetPacketType() == XFA_PacketType::Datasets && + JSNode()->GetBindingNode(); } CXFA_WidgetData* CXFA_Node::GetWidgetData() { @@ -550,7 +551,7 @@ CXFA_WidgetData* CXFA_Node::GetWidgetData() { } CXFA_WidgetData* CXFA_Node::GetContainerWidgetData() { - if (GetPacketID() != XFA_XDPPACKET_Form) + if (GetPacketType() != XFA_PacketType::Form) return nullptr; XFA_Element eType = GetElementType(); if (eType == XFA_Element::ExclGroup) @@ -735,35 +736,35 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() { } CXFA_Node* CXFA_Node::GetDataDescriptionNode() { - if (m_ePacket == XFA_XDPPACKET_Datasets) + if (m_ePacket == XFA_PacketType::Datasets) return m_pAuxNode; return nullptr; } void CXFA_Node::SetDataDescriptionNode(CXFA_Node* pDataDescriptionNode) { - ASSERT(m_ePacket == XFA_XDPPACKET_Datasets); + ASSERT(m_ePacket == XFA_PacketType::Datasets); m_pAuxNode = pDataDescriptionNode; } CXFA_Node* CXFA_Node::GetModelNode() { - switch (GetPacketID()) { - case XFA_XDPPACKET_XDP: + switch (GetPacketType()) { + case XFA_PacketType::Xdp: return m_pDocument->GetRoot(); - case XFA_XDPPACKET_Config: + case XFA_PacketType::Config: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Config)); - case XFA_XDPPACKET_Template: + case XFA_PacketType::Template: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Template)); - case XFA_XDPPACKET_Form: + case XFA_PacketType::Form: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Form)); - case XFA_XDPPACKET_Datasets: + case XFA_PacketType::Datasets: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Datasets)); - case XFA_XDPPACKET_LocaleSet: + case XFA_PacketType::LocaleSet: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_LocaleSet)); - case XFA_XDPPACKET_ConnectionSet: + case XFA_PacketType::ConnectionSet: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_ConnectionSet)); - case XFA_XDPPACKET_SourceSet: + case XFA_PacketType::SourceSet: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_SourceSet)); - case XFA_XDPPACKET_Xdc: + case XFA_PacketType::Xdc: return ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Xdc)); default: return this; @@ -1041,7 +1042,7 @@ void CXFA_Node::GetSOMExpression(WideString& wsSOMExpression) { CXFA_Node* CXFA_Node::GetInstanceMgrOfSubform() { CXFA_Node* pInstanceMgr = nullptr; - if (m_ePacket == XFA_XDPPACKET_Form) { + if (m_ePacket == XFA_PacketType::Form) { CXFA_Node* pParentNode = GetNodeItem(XFA_NODEITEM_Parent); if (!pParentNode || pParentNode->GetElementType() == XFA_Element::Area) { return pInstanceMgr; @@ -1131,7 +1132,7 @@ CFX_XMLNode* CXFA_Node::CreateXMLMappingNode() { } bool CXFA_Node::IsNeedSavingXMLNode() { - return m_pXMLNode && (GetPacketID() == XFA_XDPPACKET_Datasets || + return m_pXMLNode && (GetPacketType() == XFA_PacketType::Datasets || GetElementType() == XFA_Element::Xfa); } diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index a2e8b3042c..066be5e8fe 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -70,7 +70,7 @@ class CXFA_Node : public CXFA_Object { static XFA_Element NameToElement(const WideString& name); static std::unique_ptr<CXFA_Node> Create(CXFA_Document* doc, XFA_Element element, - XFA_XDPPACKET packet); + XFA_PacketType packet); ~CXFA_Node() override; @@ -84,7 +84,7 @@ class CXFA_Node : public CXFA_Object { XFA_Attribute GetAttribute(size_t i) const; XFA_AttributeType GetAttributeType(XFA_Attribute type) const; - XFA_XDPPACKET GetPacketID() const { return m_ePacket; } + XFA_PacketType GetPacketType() const { return m_ePacket; } void SetFlag(uint32_t dwFlag, bool bNotify); void ClearFlag(uint32_t dwFlag); @@ -123,7 +123,7 @@ class CXFA_Node : public CXFA_Object { bool IsAttributeInXML(); bool IsFormContainer() const { - return m_ePacket == XFA_XDPPACKET_Form && IsContainerNode(); + return m_ePacket == XFA_PacketType::Form && IsContainerNode(); } void SetXMLMappingNode(CFX_XMLNode* pXMLNode) { m_pXMLNode = pXMLNode; } CFX_XMLNode* GetXMLMappingNode() const { return m_pXMLNode; } @@ -182,7 +182,7 @@ class CXFA_Node : public CXFA_Object { protected: CXFA_Node(CXFA_Document* pDoc, - XFA_XDPPACKET ePacket, + XFA_PacketType ePacket, uint32_t validPackets, XFA_ObjectType oType, XFA_Element eType, @@ -208,7 +208,7 @@ class CXFA_Node : public CXFA_Object { CXFA_Node* m_pLastChild; CXFA_Node* m_pParent; CFX_XMLNode* m_pXMLNode; - const XFA_XDPPACKET m_ePacket; + const XFA_PacketType m_ePacket; uint16_t m_uNodeFlags; uint32_t m_dwNameHash; CXFA_Node* m_pAuxNode; diff --git a/xfa/fxfa/parser/cxfa_node_statics.cpp b/xfa/fxfa/parser/cxfa_node_statics.cpp index 1d7d05892b..64b70ee88b 100644 --- a/xfa/fxfa/parser/cxfa_node_statics.cpp +++ b/xfa/fxfa/parser/cxfa_node_statics.cpp @@ -922,7 +922,7 @@ XFA_Attribute CXFA_Node::NameToAttribute(const WideStringView& name) { // static std::unique_ptr<CXFA_Node> CXFA_Node::Create(CXFA_Document* doc, XFA_Element element, - XFA_XDPPACKET packet) { + XFA_PacketType packet) { ASSERT(element != XFA_Element::NodeList); std::unique_ptr<CXFA_Node> node; switch (element) { @@ -1864,7 +1864,8 @@ std::unique_ptr<CXFA_Node> CXFA_Node::Create(CXFA_Document* doc, NOTREACHED(); return nullptr; } - if (!node || !node->IsValidInPacket(packet)) + if (!node || !node->IsValidInPacket(static_cast<XFA_XDPPACKET>( + 1 << static_cast<uint8_t>(packet)))) return nullptr; return node; } diff --git a/xfa/fxfa/parser/cxfa_numberofcopies.cpp b/xfa/fxfa/parser/cxfa_numberofcopies.cpp index 5c869e474b..0978859ee1 100644 --- a/xfa/fxfa/parser/cxfa_numberofcopies.cpp +++ b/xfa/fxfa/parser/cxfa_numberofcopies.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"numberOfCopies"; } // namespace CXFA_NumberOfCopies::CXFA_NumberOfCopies(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_numberofcopies.h b/xfa/fxfa/parser/cxfa_numberofcopies.h index 32b3fce1ef..04bb599984 100644 --- a/xfa/fxfa/parser/cxfa_numberofcopies.h +++ b/xfa/fxfa/parser/cxfa_numberofcopies.h @@ -11,7 +11,7 @@ class CXFA_NumberOfCopies : public CXFA_Node { public: - CXFA_NumberOfCopies(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumberOfCopies(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumberOfCopies() override; }; diff --git a/xfa/fxfa/parser/cxfa_numberpattern.cpp b/xfa/fxfa/parser/cxfa_numberpattern.cpp index 558e2cd478..7ca8f05313 100644 --- a/xfa/fxfa/parser/cxfa_numberpattern.cpp +++ b/xfa/fxfa/parser/cxfa_numberpattern.cpp @@ -17,7 +17,8 @@ constexpr wchar_t kName[] = L"numberPattern"; } // namespace -CXFA_NumberPattern::CXFA_NumberPattern(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NumberPattern::CXFA_NumberPattern(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_numberpattern.h b/xfa/fxfa/parser/cxfa_numberpattern.h index 84be0c2b03..0a4fabd2a2 100644 --- a/xfa/fxfa/parser/cxfa_numberpattern.h +++ b/xfa/fxfa/parser/cxfa_numberpattern.h @@ -11,7 +11,7 @@ class CXFA_NumberPattern : public CXFA_Node { public: - CXFA_NumberPattern(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumberPattern(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumberPattern() override; }; diff --git a/xfa/fxfa/parser/cxfa_numberpatterns.cpp b/xfa/fxfa/parser/cxfa_numberpatterns.cpp index bcd97cca8c..a2f83739aa 100644 --- a/xfa/fxfa/parser/cxfa_numberpatterns.cpp +++ b/xfa/fxfa/parser/cxfa_numberpatterns.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"numberPatterns"; } // namespace CXFA_NumberPatterns::CXFA_NumberPatterns(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_numberpatterns.h b/xfa/fxfa/parser/cxfa_numberpatterns.h index 724070f48f..ef4f8893a2 100644 --- a/xfa/fxfa/parser/cxfa_numberpatterns.h +++ b/xfa/fxfa/parser/cxfa_numberpatterns.h @@ -11,7 +11,7 @@ class CXFA_NumberPatterns : public CXFA_Node { public: - CXFA_NumberPatterns(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumberPatterns(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumberPatterns() override; }; diff --git a/xfa/fxfa/parser/cxfa_numbersymbol.cpp b/xfa/fxfa/parser/cxfa_numbersymbol.cpp index 78417c29ab..a8c3795fa4 100644 --- a/xfa/fxfa/parser/cxfa_numbersymbol.cpp +++ b/xfa/fxfa/parser/cxfa_numbersymbol.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"numberSymbol"; } // namespace -CXFA_NumberSymbol::CXFA_NumberSymbol(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NumberSymbol::CXFA_NumberSymbol(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_numbersymbol.h b/xfa/fxfa/parser/cxfa_numbersymbol.h index a63cf3a0ce..c164b0381b 100644 --- a/xfa/fxfa/parser/cxfa_numbersymbol.h +++ b/xfa/fxfa/parser/cxfa_numbersymbol.h @@ -11,7 +11,7 @@ class CXFA_NumberSymbol : public CXFA_Node { public: - CXFA_NumberSymbol(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumberSymbol(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumberSymbol() override; }; diff --git a/xfa/fxfa/parser/cxfa_numbersymbols.cpp b/xfa/fxfa/parser/cxfa_numbersymbols.cpp index 62a94aa0f7..0d27f69c0b 100644 --- a/xfa/fxfa/parser/cxfa_numbersymbols.cpp +++ b/xfa/fxfa/parser/cxfa_numbersymbols.cpp @@ -16,7 +16,8 @@ constexpr wchar_t kName[] = L"numberSymbols"; } // namespace -CXFA_NumberSymbols::CXFA_NumberSymbols(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NumberSymbols::CXFA_NumberSymbols(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_numbersymbols.h b/xfa/fxfa/parser/cxfa_numbersymbols.h index af668d0ce8..972df9f455 100644 --- a/xfa/fxfa/parser/cxfa_numbersymbols.h +++ b/xfa/fxfa/parser/cxfa_numbersymbols.h @@ -11,7 +11,7 @@ class CXFA_NumberSymbols : public CXFA_Node { public: - CXFA_NumberSymbols(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumberSymbols(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumberSymbols() override; }; diff --git a/xfa/fxfa/parser/cxfa_numericedit.cpp b/xfa/fxfa/parser/cxfa_numericedit.cpp index 812a45381b..fb0da14f68 100644 --- a/xfa/fxfa/parser/cxfa_numericedit.cpp +++ b/xfa/fxfa/parser/cxfa_numericedit.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"numericEdit"; } // namespace -CXFA_NumericEdit::CXFA_NumericEdit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_NumericEdit::CXFA_NumericEdit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_numericedit.h b/xfa/fxfa/parser/cxfa_numericedit.h index ad2523c0f8..d9cfd7e57d 100644 --- a/xfa/fxfa/parser/cxfa_numericedit.h +++ b/xfa/fxfa/parser/cxfa_numericedit.h @@ -11,7 +11,7 @@ class CXFA_NumericEdit : public CXFA_Node { public: - CXFA_NumericEdit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_NumericEdit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_NumericEdit() override; }; diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp index 0c50e1ffab..80089f50fc 100644 --- a/xfa/fxfa/parser/cxfa_occur.cpp +++ b/xfa/fxfa/parser/cxfa_occur.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"occur"; } // namespace -CXFA_Occur::CXFA_Occur(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Occur::CXFA_Occur(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_occur.h b/xfa/fxfa/parser/cxfa_occur.h index 9a39d98470..d7ed597095 100644 --- a/xfa/fxfa/parser/cxfa_occur.h +++ b/xfa/fxfa/parser/cxfa_occur.h @@ -11,7 +11,7 @@ class CXFA_Occur : public CXFA_Node { public: - CXFA_Occur(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Occur(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Occur() override; }; diff --git a/xfa/fxfa/parser/cxfa_oid.cpp b/xfa/fxfa/parser/cxfa_oid.cpp index 8b5cdb925c..be0d12f5e5 100644 --- a/xfa/fxfa/parser/cxfa_oid.cpp +++ b/xfa/fxfa/parser/cxfa_oid.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"oid"; } // namespace -CXFA_Oid::CXFA_Oid(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Oid::CXFA_Oid(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_oid.h b/xfa/fxfa/parser/cxfa_oid.h index b76fbd07be..45abf8ba7d 100644 --- a/xfa/fxfa/parser/cxfa_oid.h +++ b/xfa/fxfa/parser/cxfa_oid.h @@ -11,7 +11,7 @@ class CXFA_Oid : public CXFA_Node { public: - CXFA_Oid(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Oid(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Oid() override; }; diff --git a/xfa/fxfa/parser/cxfa_oids.cpp b/xfa/fxfa/parser/cxfa_oids.cpp index 2a8ffbc276..57bf593abf 100644 --- a/xfa/fxfa/parser/cxfa_oids.cpp +++ b/xfa/fxfa/parser/cxfa_oids.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"oids"; } // namespace -CXFA_Oids::CXFA_Oids(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Oids::CXFA_Oids(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_oids.h b/xfa/fxfa/parser/cxfa_oids.h index 85d8e2602b..cc8cd9c2de 100644 --- a/xfa/fxfa/parser/cxfa_oids.h +++ b/xfa/fxfa/parser/cxfa_oids.h @@ -11,7 +11,7 @@ class CXFA_Oids : public CXFA_Node { public: - CXFA_Oids(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Oids(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Oids() override; }; diff --git a/xfa/fxfa/parser/cxfa_openaction.cpp b/xfa/fxfa/parser/cxfa_openaction.cpp index 69a4e2a496..c50f433e21 100644 --- a/xfa/fxfa/parser/cxfa_openaction.cpp +++ b/xfa/fxfa/parser/cxfa_openaction.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"openAction"; } // namespace -CXFA_OpenAction::CXFA_OpenAction(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_OpenAction::CXFA_OpenAction(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_openaction.h b/xfa/fxfa/parser/cxfa_openaction.h index ce59fbd374..d84eb2974f 100644 --- a/xfa/fxfa/parser/cxfa_openaction.h +++ b/xfa/fxfa/parser/cxfa_openaction.h @@ -11,7 +11,7 @@ class CXFA_OpenAction : public CXFA_Node { public: - CXFA_OpenAction(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_OpenAction(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_OpenAction() override; }; diff --git a/xfa/fxfa/parser/cxfa_operation.cpp b/xfa/fxfa/parser/cxfa_operation.cpp index 03d3ee1a5b..3fd753cb54 100644 --- a/xfa/fxfa/parser/cxfa_operation.cpp +++ b/xfa/fxfa/parser/cxfa_operation.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"operation"; } // namespace -CXFA_Operation::CXFA_Operation(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Operation::CXFA_Operation(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_operation.h b/xfa/fxfa/parser/cxfa_operation.h index e65c936b00..454a354873 100644 --- a/xfa/fxfa/parser/cxfa_operation.h +++ b/xfa/fxfa/parser/cxfa_operation.h @@ -11,7 +11,7 @@ class CXFA_Operation : public CXFA_Node { public: - CXFA_Operation(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Operation(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Operation() override; }; diff --git a/xfa/fxfa/parser/cxfa_output.cpp b/xfa/fxfa/parser/cxfa_output.cpp index 5a7077c03b..124d7e5cf1 100644 --- a/xfa/fxfa/parser/cxfa_output.cpp +++ b/xfa/fxfa/parser/cxfa_output.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"output"; } // namespace -CXFA_Output::CXFA_Output(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Output::CXFA_Output(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_output.h b/xfa/fxfa/parser/cxfa_output.h index 34d3d33a1e..2eb139113b 100644 --- a/xfa/fxfa/parser/cxfa_output.h +++ b/xfa/fxfa/parser/cxfa_output.h @@ -11,7 +11,7 @@ class CXFA_Output : public CXFA_Node { public: - CXFA_Output(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Output(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Output() override; }; diff --git a/xfa/fxfa/parser/cxfa_outputbin.cpp b/xfa/fxfa/parser/cxfa_outputbin.cpp index f6a390ac10..bb0ef2ef19 100644 --- a/xfa/fxfa/parser/cxfa_outputbin.cpp +++ b/xfa/fxfa/parser/cxfa_outputbin.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"outputBin"; } // namespace -CXFA_OutputBin::CXFA_OutputBin(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_OutputBin::CXFA_OutputBin(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_outputbin.h b/xfa/fxfa/parser/cxfa_outputbin.h index 2c29c63d13..25a1ae0a73 100644 --- a/xfa/fxfa/parser/cxfa_outputbin.h +++ b/xfa/fxfa/parser/cxfa_outputbin.h @@ -11,7 +11,7 @@ class CXFA_OutputBin : public CXFA_Node { public: - CXFA_OutputBin(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_OutputBin(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_OutputBin() override; }; diff --git a/xfa/fxfa/parser/cxfa_outputxsl.cpp b/xfa/fxfa/parser/cxfa_outputxsl.cpp index dd29ad6556..d56cc156bf 100644 --- a/xfa/fxfa/parser/cxfa_outputxsl.cpp +++ b/xfa/fxfa/parser/cxfa_outputxsl.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"outputXSL"; } // namespace -CXFA_OutputXSL::CXFA_OutputXSL(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_OutputXSL::CXFA_OutputXSL(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_outputxsl.h b/xfa/fxfa/parser/cxfa_outputxsl.h index 3be7c49ffe..45355236c0 100644 --- a/xfa/fxfa/parser/cxfa_outputxsl.h +++ b/xfa/fxfa/parser/cxfa_outputxsl.h @@ -11,7 +11,7 @@ class CXFA_OutputXSL : public CXFA_Node { public: - CXFA_OutputXSL(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_OutputXSL(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_OutputXSL() override; }; diff --git a/xfa/fxfa/parser/cxfa_overflow.cpp b/xfa/fxfa/parser/cxfa_overflow.cpp index e2290d8f7d..8f96215cb8 100644 --- a/xfa/fxfa/parser/cxfa_overflow.cpp +++ b/xfa/fxfa/parser/cxfa_overflow.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"overflow"; } // namespace -CXFA_Overflow::CXFA_Overflow(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Overflow::CXFA_Overflow(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_overflow.h b/xfa/fxfa/parser/cxfa_overflow.h index a5283e0503..e6627bacb7 100644 --- a/xfa/fxfa/parser/cxfa_overflow.h +++ b/xfa/fxfa/parser/cxfa_overflow.h @@ -11,7 +11,7 @@ class CXFA_Overflow : public CXFA_Node { public: - CXFA_Overflow(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Overflow(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Overflow() override; }; diff --git a/xfa/fxfa/parser/cxfa_overprint.cpp b/xfa/fxfa/parser/cxfa_overprint.cpp index deaa34a518..cf5ee4b577 100644 --- a/xfa/fxfa/parser/cxfa_overprint.cpp +++ b/xfa/fxfa/parser/cxfa_overprint.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"overprint"; } // namespace -CXFA_Overprint::CXFA_Overprint(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Overprint::CXFA_Overprint(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_overprint.h b/xfa/fxfa/parser/cxfa_overprint.h index 451dab1ca8..a9ec2416f0 100644 --- a/xfa/fxfa/parser/cxfa_overprint.h +++ b/xfa/fxfa/parser/cxfa_overprint.h @@ -11,7 +11,7 @@ class CXFA_Overprint : public CXFA_Node { public: - CXFA_Overprint(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Overprint(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Overprint() override; }; diff --git a/xfa/fxfa/parser/cxfa_packet.cpp b/xfa/fxfa/parser/cxfa_packet.cpp index dc5841808e..646933a9fc 100644 --- a/xfa/fxfa/parser/cxfa_packet.cpp +++ b/xfa/fxfa/parser/cxfa_packet.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"packet"; } // namespace -CXFA_Packet::CXFA_Packet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Packet::CXFA_Packet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_packet.h b/xfa/fxfa/parser/cxfa_packet.h index 66ea715b85..6bda61d429 100644 --- a/xfa/fxfa/parser/cxfa_packet.h +++ b/xfa/fxfa/parser/cxfa_packet.h @@ -11,7 +11,7 @@ class CXFA_Packet : public CXFA_Node { public: - CXFA_Packet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Packet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Packet() override; }; diff --git a/xfa/fxfa/parser/cxfa_packets.cpp b/xfa/fxfa/parser/cxfa_packets.cpp index a893a054fd..21b8b19f93 100644 --- a/xfa/fxfa/parser/cxfa_packets.cpp +++ b/xfa/fxfa/parser/cxfa_packets.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"packets"; } // namespace -CXFA_Packets::CXFA_Packets(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Packets::CXFA_Packets(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_packets.h b/xfa/fxfa/parser/cxfa_packets.h index 8a7fde5b7b..ebf29b670b 100644 --- a/xfa/fxfa/parser/cxfa_packets.h +++ b/xfa/fxfa/parser/cxfa_packets.h @@ -11,7 +11,7 @@ class CXFA_Packets : public CXFA_Node { public: - CXFA_Packets(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Packets(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Packets() override; }; diff --git a/xfa/fxfa/parser/cxfa_pagearea.cpp b/xfa/fxfa/parser/cxfa_pagearea.cpp index 2fc487c470..2b4b1e1796 100644 --- a/xfa/fxfa/parser/cxfa_pagearea.cpp +++ b/xfa/fxfa/parser/cxfa_pagearea.cpp @@ -33,7 +33,7 @@ constexpr wchar_t kName[] = L"pageArea"; } // namespace -CXFA_PageArea::CXFA_PageArea(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PageArea::CXFA_PageArea(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_pagearea.h b/xfa/fxfa/parser/cxfa_pagearea.h index d71fc59236..f3cab1e073 100644 --- a/xfa/fxfa/parser/cxfa_pagearea.h +++ b/xfa/fxfa/parser/cxfa_pagearea.h @@ -11,7 +11,7 @@ class CXFA_PageArea : public CXFA_Node { public: - CXFA_PageArea(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PageArea(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PageArea() override; }; diff --git a/xfa/fxfa/parser/cxfa_pageoffset.cpp b/xfa/fxfa/parser/cxfa_pageoffset.cpp index 81ac51d161..467101914d 100644 --- a/xfa/fxfa/parser/cxfa_pageoffset.cpp +++ b/xfa/fxfa/parser/cxfa_pageoffset.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"pageOffset"; } // namespace -CXFA_PageOffset::CXFA_PageOffset(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PageOffset::CXFA_PageOffset(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pageoffset.h b/xfa/fxfa/parser/cxfa_pageoffset.h index 1c8d243552..a396c57baf 100644 --- a/xfa/fxfa/parser/cxfa_pageoffset.h +++ b/xfa/fxfa/parser/cxfa_pageoffset.h @@ -11,7 +11,7 @@ class CXFA_PageOffset : public CXFA_Node { public: - CXFA_PageOffset(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PageOffset(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PageOffset() override; }; diff --git a/xfa/fxfa/parser/cxfa_pagerange.cpp b/xfa/fxfa/parser/cxfa_pagerange.cpp index 48e5031b0e..5de7f5fa64 100644 --- a/xfa/fxfa/parser/cxfa_pagerange.cpp +++ b/xfa/fxfa/parser/cxfa_pagerange.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"pageRange"; } // namespace -CXFA_PageRange::CXFA_PageRange(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PageRange::CXFA_PageRange(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pagerange.h b/xfa/fxfa/parser/cxfa_pagerange.h index 67662279f0..949276aa9c 100644 --- a/xfa/fxfa/parser/cxfa_pagerange.h +++ b/xfa/fxfa/parser/cxfa_pagerange.h @@ -11,7 +11,7 @@ class CXFA_PageRange : public CXFA_Node { public: - CXFA_PageRange(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PageRange(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PageRange() override; }; diff --git a/xfa/fxfa/parser/cxfa_pageset.cpp b/xfa/fxfa/parser/cxfa_pageset.cpp index 764b1cce71..050790ef53 100644 --- a/xfa/fxfa/parser/cxfa_pageset.cpp +++ b/xfa/fxfa/parser/cxfa_pageset.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"pageSet"; } // namespace -CXFA_PageSet::CXFA_PageSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PageSet::CXFA_PageSet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_pageset.h b/xfa/fxfa/parser/cxfa_pageset.h index 487d358d76..9cc3b1708e 100644 --- a/xfa/fxfa/parser/cxfa_pageset.h +++ b/xfa/fxfa/parser/cxfa_pageset.h @@ -11,7 +11,7 @@ class CXFA_PageSet : public CXFA_Node { public: - CXFA_PageSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PageSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PageSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_pagination.cpp b/xfa/fxfa/parser/cxfa_pagination.cpp index 8f6090415a..99600eae1b 100644 --- a/xfa/fxfa/parser/cxfa_pagination.cpp +++ b/xfa/fxfa/parser/cxfa_pagination.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"pagination"; } // namespace -CXFA_Pagination::CXFA_Pagination(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Pagination::CXFA_Pagination(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pagination.h b/xfa/fxfa/parser/cxfa_pagination.h index fba83867d4..a455ecbaed 100644 --- a/xfa/fxfa/parser/cxfa_pagination.h +++ b/xfa/fxfa/parser/cxfa_pagination.h @@ -11,7 +11,7 @@ class CXFA_Pagination : public CXFA_Node { public: - CXFA_Pagination(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Pagination(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Pagination() override; }; diff --git a/xfa/fxfa/parser/cxfa_paginationoverride.cpp b/xfa/fxfa/parser/cxfa_paginationoverride.cpp index 41e742b849..8e8b6c682d 100644 --- a/xfa/fxfa/parser/cxfa_paginationoverride.cpp +++ b/xfa/fxfa/parser/cxfa_paginationoverride.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"paginationOverride"; } // namespace CXFA_PaginationOverride::CXFA_PaginationOverride(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_paginationoverride.h b/xfa/fxfa/parser/cxfa_paginationoverride.h index 156e7d634b..9cc9528244 100644 --- a/xfa/fxfa/parser/cxfa_paginationoverride.h +++ b/xfa/fxfa/parser/cxfa_paginationoverride.h @@ -11,7 +11,7 @@ class CXFA_PaginationOverride : public CXFA_Node { public: - CXFA_PaginationOverride(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PaginationOverride(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PaginationOverride() override; }; diff --git a/xfa/fxfa/parser/cxfa_para.cpp b/xfa/fxfa/parser/cxfa_para.cpp index 3fe413bdb7..aab8d19c1c 100644 --- a/xfa/fxfa/parser/cxfa_para.cpp +++ b/xfa/fxfa/parser/cxfa_para.cpp @@ -37,7 +37,7 @@ constexpr wchar_t kName[] = L"para"; } // namespace -CXFA_Para::CXFA_Para(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Para::CXFA_Para(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_para.h b/xfa/fxfa/parser/cxfa_para.h index 00ac970bc0..47c4d85eb8 100644 --- a/xfa/fxfa/parser/cxfa_para.h +++ b/xfa/fxfa/parser/cxfa_para.h @@ -11,7 +11,7 @@ class CXFA_Para : public CXFA_Node { public: - CXFA_Para(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Para(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Para() override; }; diff --git a/xfa/fxfa/parser/cxfa_part.cpp b/xfa/fxfa/parser/cxfa_part.cpp index fb510c290c..d645571f9c 100644 --- a/xfa/fxfa/parser/cxfa_part.cpp +++ b/xfa/fxfa/parser/cxfa_part.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"part"; } // namespace -CXFA_Part::CXFA_Part(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Part::CXFA_Part(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_part.h b/xfa/fxfa/parser/cxfa_part.h index f4114d0674..3db76399a7 100644 --- a/xfa/fxfa/parser/cxfa_part.h +++ b/xfa/fxfa/parser/cxfa_part.h @@ -11,7 +11,7 @@ class CXFA_Part : public CXFA_Node { public: - CXFA_Part(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Part(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Part() override; }; diff --git a/xfa/fxfa/parser/cxfa_password.cpp b/xfa/fxfa/parser/cxfa_password.cpp index 29a25f2345..1d7a60fc37 100644 --- a/xfa/fxfa/parser/cxfa_password.cpp +++ b/xfa/fxfa/parser/cxfa_password.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"password"; } // namespace -CXFA_Password::CXFA_Password(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Password::CXFA_Password(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_password.h b/xfa/fxfa/parser/cxfa_password.h index feffdb5c71..904f91fd3d 100644 --- a/xfa/fxfa/parser/cxfa_password.h +++ b/xfa/fxfa/parser/cxfa_password.h @@ -11,7 +11,7 @@ class CXFA_Password : public CXFA_Node { public: - CXFA_Password(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Password(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Password() override; }; diff --git a/xfa/fxfa/parser/cxfa_passwordedit.cpp b/xfa/fxfa/parser/cxfa_passwordedit.cpp index 50ee196b4d..da026ee3fa 100644 --- a/xfa/fxfa/parser/cxfa_passwordedit.cpp +++ b/xfa/fxfa/parser/cxfa_passwordedit.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"passwordEdit"; } // namespace -CXFA_PasswordEdit::CXFA_PasswordEdit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PasswordEdit::CXFA_PasswordEdit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_passwordedit.h b/xfa/fxfa/parser/cxfa_passwordedit.h index 1c408cb4b0..2db05ba7e2 100644 --- a/xfa/fxfa/parser/cxfa_passwordedit.h +++ b/xfa/fxfa/parser/cxfa_passwordedit.h @@ -11,7 +11,7 @@ class CXFA_PasswordEdit : public CXFA_Node { public: - CXFA_PasswordEdit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PasswordEdit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PasswordEdit() override; }; diff --git a/xfa/fxfa/parser/cxfa_pattern.cpp b/xfa/fxfa/parser/cxfa_pattern.cpp index 0b625868de..b1f14cbbbc 100644 --- a/xfa/fxfa/parser/cxfa_pattern.cpp +++ b/xfa/fxfa/parser/cxfa_pattern.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"pattern"; } // namespace -CXFA_Pattern::CXFA_Pattern(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Pattern::CXFA_Pattern(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_pattern.h b/xfa/fxfa/parser/cxfa_pattern.h index 066e92f610..44fb0af2b7 100644 --- a/xfa/fxfa/parser/cxfa_pattern.h +++ b/xfa/fxfa/parser/cxfa_pattern.h @@ -11,7 +11,7 @@ class CXFA_Pattern : public CXFA_Node { public: - CXFA_Pattern(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Pattern(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Pattern() override; }; diff --git a/xfa/fxfa/parser/cxfa_pcl.cpp b/xfa/fxfa/parser/cxfa_pcl.cpp index 4a723f5d9d..1f5e348420 100644 --- a/xfa/fxfa/parser/cxfa_pcl.cpp +++ b/xfa/fxfa/parser/cxfa_pcl.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"pcl"; } // namespace -CXFA_Pcl::CXFA_Pcl(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Pcl::CXFA_Pcl(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pcl.h b/xfa/fxfa/parser/cxfa_pcl.h index eb1a08febd..9b78265794 100644 --- a/xfa/fxfa/parser/cxfa_pcl.h +++ b/xfa/fxfa/parser/cxfa_pcl.h @@ -11,7 +11,7 @@ class CXFA_Pcl : public CXFA_Node { public: - CXFA_Pcl(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Pcl(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Pcl() override; }; diff --git a/xfa/fxfa/parser/cxfa_pdf.cpp b/xfa/fxfa/parser/cxfa_pdf.cpp index 0318d41f54..800d393925 100644 --- a/xfa/fxfa/parser/cxfa_pdf.cpp +++ b/xfa/fxfa/parser/cxfa_pdf.cpp @@ -39,7 +39,7 @@ constexpr wchar_t kName[] = L"pdf"; } // namespace -CXFA_Pdf::CXFA_Pdf(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Pdf::CXFA_Pdf(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pdf.h b/xfa/fxfa/parser/cxfa_pdf.h index dcf39ba4cc..d0925c8a94 100644 --- a/xfa/fxfa/parser/cxfa_pdf.h +++ b/xfa/fxfa/parser/cxfa_pdf.h @@ -11,7 +11,7 @@ class CXFA_Pdf : public CXFA_Node { public: - CXFA_Pdf(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Pdf(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Pdf() override; }; diff --git a/xfa/fxfa/parser/cxfa_pdfa.cpp b/xfa/fxfa/parser/cxfa_pdfa.cpp index 01f32ce948..f41eb93e4b 100644 --- a/xfa/fxfa/parser/cxfa_pdfa.cpp +++ b/xfa/fxfa/parser/cxfa_pdfa.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"pdfa"; } // namespace -CXFA_Pdfa::CXFA_Pdfa(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Pdfa::CXFA_Pdfa(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_pdfa.h b/xfa/fxfa/parser/cxfa_pdfa.h index c0549ab90e..d0816a2733 100644 --- a/xfa/fxfa/parser/cxfa_pdfa.h +++ b/xfa/fxfa/parser/cxfa_pdfa.h @@ -11,7 +11,7 @@ class CXFA_Pdfa : public CXFA_Node { public: - CXFA_Pdfa(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Pdfa(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Pdfa() override; }; diff --git a/xfa/fxfa/parser/cxfa_permissions.cpp b/xfa/fxfa/parser/cxfa_permissions.cpp index 21fdead616..a56ac32cd2 100644 --- a/xfa/fxfa/parser/cxfa_permissions.cpp +++ b/xfa/fxfa/parser/cxfa_permissions.cpp @@ -28,7 +28,7 @@ constexpr wchar_t kName[] = L"permissions"; } // namespace -CXFA_Permissions::CXFA_Permissions(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Permissions::CXFA_Permissions(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_permissions.h b/xfa/fxfa/parser/cxfa_permissions.h index b0b639bef7..dca9018b17 100644 --- a/xfa/fxfa/parser/cxfa_permissions.h +++ b/xfa/fxfa/parser/cxfa_permissions.h @@ -11,7 +11,7 @@ class CXFA_Permissions : public CXFA_Node { public: - CXFA_Permissions(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Permissions(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Permissions() override; }; diff --git a/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp b/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp index 5a477d01b5..b4e5ec2b3c 100644 --- a/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp +++ b/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"pickTrayByPDFSize"; } // namespace CXFA_PickTrayByPDFSize::CXFA_PickTrayByPDFSize(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_picktraybypdfsize.h b/xfa/fxfa/parser/cxfa_picktraybypdfsize.h index 1257523bf7..ef75e5c8fc 100644 --- a/xfa/fxfa/parser/cxfa_picktraybypdfsize.h +++ b/xfa/fxfa/parser/cxfa_picktraybypdfsize.h @@ -11,7 +11,7 @@ class CXFA_PickTrayByPDFSize : public CXFA_Node { public: - CXFA_PickTrayByPDFSize(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PickTrayByPDFSize(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PickTrayByPDFSize() override; }; diff --git a/xfa/fxfa/parser/cxfa_picture.cpp b/xfa/fxfa/parser/cxfa_picture.cpp index 1ab630757b..1947ddf8e9 100644 --- a/xfa/fxfa/parser/cxfa_picture.cpp +++ b/xfa/fxfa/parser/cxfa_picture.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"picture"; } // namespace -CXFA_Picture::CXFA_Picture(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Picture::CXFA_Picture(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_picture.h b/xfa/fxfa/parser/cxfa_picture.h index 4e2f95e48f..9fd2c558e2 100644 --- a/xfa/fxfa/parser/cxfa_picture.h +++ b/xfa/fxfa/parser/cxfa_picture.h @@ -11,7 +11,7 @@ class CXFA_Picture : public CXFA_Node { public: - CXFA_Picture(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Picture(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Picture() override; }; diff --git a/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp b/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp index 3ad5cfd036..a5c51dd7e5 100644 --- a/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp +++ b/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"plaintextMetadata"; } // namespace CXFA_PlaintextMetadata::CXFA_PlaintextMetadata(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_plaintextmetadata.h b/xfa/fxfa/parser/cxfa_plaintextmetadata.h index dc940c2913..03dce65f79 100644 --- a/xfa/fxfa/parser/cxfa_plaintextmetadata.h +++ b/xfa/fxfa/parser/cxfa_plaintextmetadata.h @@ -11,7 +11,7 @@ class CXFA_PlaintextMetadata : public CXFA_Node { public: - CXFA_PlaintextMetadata(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PlaintextMetadata(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PlaintextMetadata() override; }; diff --git a/xfa/fxfa/parser/cxfa_presence.cpp b/xfa/fxfa/parser/cxfa_presence.cpp index 54547b96c1..f2389d91ab 100644 --- a/xfa/fxfa/parser/cxfa_presence.cpp +++ b/xfa/fxfa/parser/cxfa_presence.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"presence"; } // namespace -CXFA_Presence::CXFA_Presence(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Presence::CXFA_Presence(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_presence.h b/xfa/fxfa/parser/cxfa_presence.h index bf13d1a88c..a9b7766fe1 100644 --- a/xfa/fxfa/parser/cxfa_presence.h +++ b/xfa/fxfa/parser/cxfa_presence.h @@ -11,7 +11,7 @@ class CXFA_Presence : public CXFA_Node { public: - CXFA_Presence(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Presence(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Presence() override; }; diff --git a/xfa/fxfa/parser/cxfa_present.cpp b/xfa/fxfa/parser/cxfa_present.cpp index 2792cad8a9..7552a79c6f 100644 --- a/xfa/fxfa/parser/cxfa_present.cpp +++ b/xfa/fxfa/parser/cxfa_present.cpp @@ -33,7 +33,7 @@ constexpr wchar_t kName[] = L"present"; } // namespace -CXFA_Present::CXFA_Present(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Present::CXFA_Present(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_present.h b/xfa/fxfa/parser/cxfa_present.h index 83cfaf9a55..13b3c61664 100644 --- a/xfa/fxfa/parser/cxfa_present.h +++ b/xfa/fxfa/parser/cxfa_present.h @@ -11,7 +11,7 @@ class CXFA_Present : public CXFA_Node { public: - CXFA_Present(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Present(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Present() override; }; diff --git a/xfa/fxfa/parser/cxfa_print.cpp b/xfa/fxfa/parser/cxfa_print.cpp index b1bd71ac05..f90186de26 100644 --- a/xfa/fxfa/parser/cxfa_print.cpp +++ b/xfa/fxfa/parser/cxfa_print.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"print"; } // namespace -CXFA_Print::CXFA_Print(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Print::CXFA_Print(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_print.h b/xfa/fxfa/parser/cxfa_print.h index 048c3c329e..5f2513e10d 100644 --- a/xfa/fxfa/parser/cxfa_print.h +++ b/xfa/fxfa/parser/cxfa_print.h @@ -11,7 +11,7 @@ class CXFA_Print : public CXFA_Node { public: - CXFA_Print(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Print(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Print() override; }; diff --git a/xfa/fxfa/parser/cxfa_printername.cpp b/xfa/fxfa/parser/cxfa_printername.cpp index 31fc5f5efe..a5e6197a10 100644 --- a/xfa/fxfa/parser/cxfa_printername.cpp +++ b/xfa/fxfa/parser/cxfa_printername.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"printerName"; } // namespace -CXFA_PrinterName::CXFA_PrinterName(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PrinterName::CXFA_PrinterName(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_printername.h b/xfa/fxfa/parser/cxfa_printername.h index c79fd63797..4f07885ccf 100644 --- a/xfa/fxfa/parser/cxfa_printername.h +++ b/xfa/fxfa/parser/cxfa_printername.h @@ -11,7 +11,7 @@ class CXFA_PrinterName : public CXFA_Node { public: - CXFA_PrinterName(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PrinterName(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PrinterName() override; }; diff --git a/xfa/fxfa/parser/cxfa_printhighquality.cpp b/xfa/fxfa/parser/cxfa_printhighquality.cpp index 0febf5d2b0..8b1184f288 100644 --- a/xfa/fxfa/parser/cxfa_printhighquality.cpp +++ b/xfa/fxfa/parser/cxfa_printhighquality.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"printHighQuality"; } // namespace CXFA_PrintHighQuality::CXFA_PrintHighQuality(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_printhighquality.h b/xfa/fxfa/parser/cxfa_printhighquality.h index 4752bc6e96..6cd61125bd 100644 --- a/xfa/fxfa/parser/cxfa_printhighquality.h +++ b/xfa/fxfa/parser/cxfa_printhighquality.h @@ -11,7 +11,7 @@ class CXFA_PrintHighQuality : public CXFA_Node { public: - CXFA_PrintHighQuality(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PrintHighQuality(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PrintHighQuality() override; }; diff --git a/xfa/fxfa/parser/cxfa_printscaling.cpp b/xfa/fxfa/parser/cxfa_printscaling.cpp index d400f64449..8d68f688d4 100644 --- a/xfa/fxfa/parser/cxfa_printscaling.cpp +++ b/xfa/fxfa/parser/cxfa_printscaling.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"printScaling"; } // namespace -CXFA_PrintScaling::CXFA_PrintScaling(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PrintScaling::CXFA_PrintScaling(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_printscaling.h b/xfa/fxfa/parser/cxfa_printscaling.h index bfe69ebc21..e21d427e2a 100644 --- a/xfa/fxfa/parser/cxfa_printscaling.h +++ b/xfa/fxfa/parser/cxfa_printscaling.h @@ -11,7 +11,7 @@ class CXFA_PrintScaling : public CXFA_Node { public: - CXFA_PrintScaling(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PrintScaling(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PrintScaling() override; }; diff --git a/xfa/fxfa/parser/cxfa_producer.cpp b/xfa/fxfa/parser/cxfa_producer.cpp index 585a32cb71..45253c7368 100644 --- a/xfa/fxfa/parser/cxfa_producer.cpp +++ b/xfa/fxfa/parser/cxfa_producer.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"producer"; } // namespace -CXFA_Producer::CXFA_Producer(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Producer::CXFA_Producer(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_producer.h b/xfa/fxfa/parser/cxfa_producer.h index 1065031277..584826e752 100644 --- a/xfa/fxfa/parser/cxfa_producer.h +++ b/xfa/fxfa/parser/cxfa_producer.h @@ -11,7 +11,7 @@ class CXFA_Producer : public CXFA_Node { public: - CXFA_Producer(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Producer(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Producer() override; }; diff --git a/xfa/fxfa/parser/cxfa_proto.cpp b/xfa/fxfa/parser/cxfa_proto.cpp index 6d846c7420..6d103e745e 100644 --- a/xfa/fxfa/parser/cxfa_proto.cpp +++ b/xfa/fxfa/parser/cxfa_proto.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"proto"; } // namespace -CXFA_Proto::CXFA_Proto(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Proto::CXFA_Proto(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_proto.h b/xfa/fxfa/parser/cxfa_proto.h index 52509e4ba9..8e1d84a54e 100644 --- a/xfa/fxfa/parser/cxfa_proto.h +++ b/xfa/fxfa/parser/cxfa_proto.h @@ -11,7 +11,7 @@ class CXFA_Proto : public CXFA_Node { public: - CXFA_Proto(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Proto(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Proto() override; }; diff --git a/xfa/fxfa/parser/cxfa_ps.cpp b/xfa/fxfa/parser/cxfa_ps.cpp index 09676a909b..1b2f532651 100644 --- a/xfa/fxfa/parser/cxfa_ps.cpp +++ b/xfa/fxfa/parser/cxfa_ps.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"ps"; } // namespace -CXFA_Ps::CXFA_Ps(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Ps::CXFA_Ps(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_ps.h b/xfa/fxfa/parser/cxfa_ps.h index 460ad418a4..5ef7e82c5c 100644 --- a/xfa/fxfa/parser/cxfa_ps.h +++ b/xfa/fxfa/parser/cxfa_ps.h @@ -11,7 +11,7 @@ class CXFA_Ps : public CXFA_Node { public: - CXFA_Ps(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Ps(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Ps() override; }; diff --git a/xfa/fxfa/parser/cxfa_psmap.cpp b/xfa/fxfa/parser/cxfa_psmap.cpp index 52ed45eb4c..0c0b1224b1 100644 --- a/xfa/fxfa/parser/cxfa_psmap.cpp +++ b/xfa/fxfa/parser/cxfa_psmap.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"psMap"; } // namespace -CXFA_PsMap::CXFA_PsMap(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_PsMap::CXFA_PsMap(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_psmap.h b/xfa/fxfa/parser/cxfa_psmap.h index 5129a72887..8297aaa917 100644 --- a/xfa/fxfa/parser/cxfa_psmap.h +++ b/xfa/fxfa/parser/cxfa_psmap.h @@ -11,7 +11,7 @@ class CXFA_PsMap : public CXFA_Node { public: - CXFA_PsMap(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_PsMap(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_PsMap() override; }; diff --git a/xfa/fxfa/parser/cxfa_query.cpp b/xfa/fxfa/parser/cxfa_query.cpp index dd3427eb84..09658a66b1 100644 --- a/xfa/fxfa/parser/cxfa_query.cpp +++ b/xfa/fxfa/parser/cxfa_query.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"query"; } // namespace -CXFA_Query::CXFA_Query(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Query::CXFA_Query(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_query.h b/xfa/fxfa/parser/cxfa_query.h index a4fe3d9d2a..548e7fc032 100644 --- a/xfa/fxfa/parser/cxfa_query.h +++ b/xfa/fxfa/parser/cxfa_query.h @@ -11,7 +11,7 @@ class CXFA_Query : public CXFA_Node { public: - CXFA_Query(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Query(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Query() override; }; diff --git a/xfa/fxfa/parser/cxfa_radial.cpp b/xfa/fxfa/parser/cxfa_radial.cpp index 3f5ac4bfdf..3346cf89d1 100644 --- a/xfa/fxfa/parser/cxfa_radial.cpp +++ b/xfa/fxfa/parser/cxfa_radial.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"radial"; } // namespace -CXFA_Radial::CXFA_Radial(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Radial::CXFA_Radial(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_radial.h b/xfa/fxfa/parser/cxfa_radial.h index 00a4459f47..2316c459c7 100644 --- a/xfa/fxfa/parser/cxfa_radial.h +++ b/xfa/fxfa/parser/cxfa_radial.h @@ -11,7 +11,7 @@ class CXFA_Radial : public CXFA_Node { public: - CXFA_Radial(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Radial(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Radial() override; }; diff --git a/xfa/fxfa/parser/cxfa_range.cpp b/xfa/fxfa/parser/cxfa_range.cpp index c72b89c489..bd5f87023c 100644 --- a/xfa/fxfa/parser/cxfa_range.cpp +++ b/xfa/fxfa/parser/cxfa_range.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"range"; } // namespace -CXFA_Range::CXFA_Range(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Range::CXFA_Range(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_range.h b/xfa/fxfa/parser/cxfa_range.h index 6b923ea477..23c8d1fc27 100644 --- a/xfa/fxfa/parser/cxfa_range.h +++ b/xfa/fxfa/parser/cxfa_range.h @@ -11,7 +11,7 @@ class CXFA_Range : public CXFA_Node { public: - CXFA_Range(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Range(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Range() override; }; diff --git a/xfa/fxfa/parser/cxfa_reason.cpp b/xfa/fxfa/parser/cxfa_reason.cpp index 5a6f753f8f..2d8ab2c9db 100644 --- a/xfa/fxfa/parser/cxfa_reason.cpp +++ b/xfa/fxfa/parser/cxfa_reason.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"reason"; } // namespace -CXFA_Reason::CXFA_Reason(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Reason::CXFA_Reason(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_reason.h b/xfa/fxfa/parser/cxfa_reason.h index a78aebb563..451fd820da 100644 --- a/xfa/fxfa/parser/cxfa_reason.h +++ b/xfa/fxfa/parser/cxfa_reason.h @@ -11,7 +11,7 @@ class CXFA_Reason : public CXFA_Node { public: - CXFA_Reason(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Reason(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Reason() override; }; diff --git a/xfa/fxfa/parser/cxfa_reasons.cpp b/xfa/fxfa/parser/cxfa_reasons.cpp index afcb665dc2..4db0370261 100644 --- a/xfa/fxfa/parser/cxfa_reasons.cpp +++ b/xfa/fxfa/parser/cxfa_reasons.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"reasons"; } // namespace -CXFA_Reasons::CXFA_Reasons(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Reasons::CXFA_Reasons(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_reasons.h b/xfa/fxfa/parser/cxfa_reasons.h index a1938255b5..57e9e092c8 100644 --- a/xfa/fxfa/parser/cxfa_reasons.h +++ b/xfa/fxfa/parser/cxfa_reasons.h @@ -11,7 +11,7 @@ class CXFA_Reasons : public CXFA_Node { public: - CXFA_Reasons(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Reasons(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Reasons() override; }; diff --git a/xfa/fxfa/parser/cxfa_record.cpp b/xfa/fxfa/parser/cxfa_record.cpp index aefe0c423f..5c5ded1f01 100644 --- a/xfa/fxfa/parser/cxfa_record.cpp +++ b/xfa/fxfa/parser/cxfa_record.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"record"; } // namespace -CXFA_Record::CXFA_Record(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Record::CXFA_Record(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_record.h b/xfa/fxfa/parser/cxfa_record.h index 68a38c3733..bd2622da7a 100644 --- a/xfa/fxfa/parser/cxfa_record.h +++ b/xfa/fxfa/parser/cxfa_record.h @@ -11,7 +11,7 @@ class CXFA_Record : public CXFA_Node { public: - CXFA_Record(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Record(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Record() override; }; diff --git a/xfa/fxfa/parser/cxfa_recordset.cpp b/xfa/fxfa/parser/cxfa_recordset.cpp index 4da2239a9f..ef6667ff5e 100644 --- a/xfa/fxfa/parser/cxfa_recordset.cpp +++ b/xfa/fxfa/parser/cxfa_recordset.cpp @@ -30,7 +30,7 @@ constexpr wchar_t kName[] = L"recordSet"; } // namespace -CXFA_RecordSet::CXFA_RecordSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_RecordSet::CXFA_RecordSet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_recordset.h b/xfa/fxfa/parser/cxfa_recordset.h index df08c6ff63..c623516403 100644 --- a/xfa/fxfa/parser/cxfa_recordset.h +++ b/xfa/fxfa/parser/cxfa_recordset.h @@ -11,7 +11,7 @@ class CXFA_RecordSet : public CXFA_Node { public: - CXFA_RecordSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_RecordSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_RecordSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp index 29fb41146b..5a13c8a640 100644 --- a/xfa/fxfa/parser/cxfa_rectangle.cpp +++ b/xfa/fxfa/parser/cxfa_rectangle.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"rectangle"; } // namespace -CXFA_Rectangle::CXFA_Rectangle(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Rectangle::CXFA_Rectangle(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_rectangle.h b/xfa/fxfa/parser/cxfa_rectangle.h index af46554b05..1cb472053c 100644 --- a/xfa/fxfa/parser/cxfa_rectangle.h +++ b/xfa/fxfa/parser/cxfa_rectangle.h @@ -11,7 +11,7 @@ class CXFA_Rectangle : public CXFA_Node { public: - CXFA_Rectangle(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Rectangle(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Rectangle() override; }; diff --git a/xfa/fxfa/parser/cxfa_ref.cpp b/xfa/fxfa/parser/cxfa_ref.cpp index 3d1e37835b..51bea82254 100644 --- a/xfa/fxfa/parser/cxfa_ref.cpp +++ b/xfa/fxfa/parser/cxfa_ref.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"ref"; } // namespace -CXFA_Ref::CXFA_Ref(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Ref::CXFA_Ref(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_ref.h b/xfa/fxfa/parser/cxfa_ref.h index f99c960b33..630510fe2f 100644 --- a/xfa/fxfa/parser/cxfa_ref.h +++ b/xfa/fxfa/parser/cxfa_ref.h @@ -11,7 +11,7 @@ class CXFA_Ref : public CXFA_Node { public: - CXFA_Ref(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Ref(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Ref() override; }; diff --git a/xfa/fxfa/parser/cxfa_relevant.cpp b/xfa/fxfa/parser/cxfa_relevant.cpp index b4fa4bb873..c67ff1e318 100644 --- a/xfa/fxfa/parser/cxfa_relevant.cpp +++ b/xfa/fxfa/parser/cxfa_relevant.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"relevant"; } // namespace -CXFA_Relevant::CXFA_Relevant(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Relevant::CXFA_Relevant(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_relevant.h b/xfa/fxfa/parser/cxfa_relevant.h index 90fbddf5d4..2018c95e67 100644 --- a/xfa/fxfa/parser/cxfa_relevant.h +++ b/xfa/fxfa/parser/cxfa_relevant.h @@ -11,7 +11,7 @@ class CXFA_Relevant : public CXFA_Node { public: - CXFA_Relevant(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Relevant(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Relevant() override; }; diff --git a/xfa/fxfa/parser/cxfa_rename.cpp b/xfa/fxfa/parser/cxfa_rename.cpp index f91ac31d3d..b0adbd7af8 100644 --- a/xfa/fxfa/parser/cxfa_rename.cpp +++ b/xfa/fxfa/parser/cxfa_rename.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"rename"; } // namespace -CXFA_Rename::CXFA_Rename(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Rename::CXFA_Rename(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_rename.h b/xfa/fxfa/parser/cxfa_rename.h index 901125afd1..665c85286e 100644 --- a/xfa/fxfa/parser/cxfa_rename.h +++ b/xfa/fxfa/parser/cxfa_rename.h @@ -11,7 +11,7 @@ class CXFA_Rename : public CXFA_Node { public: - CXFA_Rename(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Rename(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Rename() override; }; diff --git a/xfa/fxfa/parser/cxfa_renderpolicy.cpp b/xfa/fxfa/parser/cxfa_renderpolicy.cpp index 71bbb82dce..a8abdb3bd8 100644 --- a/xfa/fxfa/parser/cxfa_renderpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_renderpolicy.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"renderPolicy"; } // namespace -CXFA_RenderPolicy::CXFA_RenderPolicy(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_RenderPolicy::CXFA_RenderPolicy(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_renderpolicy.h b/xfa/fxfa/parser/cxfa_renderpolicy.h index 732201452b..24ddf46d99 100644 --- a/xfa/fxfa/parser/cxfa_renderpolicy.h +++ b/xfa/fxfa/parser/cxfa_renderpolicy.h @@ -11,7 +11,7 @@ class CXFA_RenderPolicy : public CXFA_Node { public: - CXFA_RenderPolicy(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_RenderPolicy(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_RenderPolicy() override; }; diff --git a/xfa/fxfa/parser/cxfa_rootelement.cpp b/xfa/fxfa/parser/cxfa_rootelement.cpp index 1332e79d0b..7f9e868fd8 100644 --- a/xfa/fxfa/parser/cxfa_rootelement.cpp +++ b/xfa/fxfa/parser/cxfa_rootelement.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"rootElement"; } // namespace -CXFA_RootElement::CXFA_RootElement(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_RootElement::CXFA_RootElement(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_rootelement.h b/xfa/fxfa/parser/cxfa_rootelement.h index be55fc1890..a995e8cc3a 100644 --- a/xfa/fxfa/parser/cxfa_rootelement.h +++ b/xfa/fxfa/parser/cxfa_rootelement.h @@ -11,7 +11,7 @@ class CXFA_RootElement : public CXFA_Node { public: - CXFA_RootElement(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_RootElement(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_RootElement() override; }; diff --git a/xfa/fxfa/parser/cxfa_runscripts.cpp b/xfa/fxfa/parser/cxfa_runscripts.cpp index 8000eb8a11..06c0d522c9 100644 --- a/xfa/fxfa/parser/cxfa_runscripts.cpp +++ b/xfa/fxfa/parser/cxfa_runscripts.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"runScripts"; } // namespace -CXFA_RunScripts::CXFA_RunScripts(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_RunScripts::CXFA_RunScripts(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_runscripts.h b/xfa/fxfa/parser/cxfa_runscripts.h index 0dc6e7d7c9..d2ecaa0f16 100644 --- a/xfa/fxfa/parser/cxfa_runscripts.h +++ b/xfa/fxfa/parser/cxfa_runscripts.h @@ -11,7 +11,7 @@ class CXFA_RunScripts : public CXFA_Node { public: - CXFA_RunScripts(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_RunScripts(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_RunScripts() override; }; diff --git a/xfa/fxfa/parser/cxfa_script.cpp b/xfa/fxfa/parser/cxfa_script.cpp index c83d75bac5..158b5eeaa5 100644 --- a/xfa/fxfa/parser/cxfa_script.cpp +++ b/xfa/fxfa/parser/cxfa_script.cpp @@ -30,7 +30,7 @@ constexpr wchar_t kName[] = L"script"; } // namespace -CXFA_Script::CXFA_Script(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Script::CXFA_Script(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_script.h b/xfa/fxfa/parser/cxfa_script.h index f88b8b5d69..d14f7c113b 100644 --- a/xfa/fxfa/parser/cxfa_script.h +++ b/xfa/fxfa/parser/cxfa_script.h @@ -11,7 +11,7 @@ class CXFA_Script : public CXFA_Node { public: - CXFA_Script(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Script(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Script() override; }; diff --git a/xfa/fxfa/parser/cxfa_scriptmodel.cpp b/xfa/fxfa/parser/cxfa_scriptmodel.cpp index 46b81fefcf..868dac5dc7 100644 --- a/xfa/fxfa/parser/cxfa_scriptmodel.cpp +++ b/xfa/fxfa/parser/cxfa_scriptmodel.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"scriptModel"; } // namespace -CXFA_ScriptModel::CXFA_ScriptModel(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ScriptModel::CXFA_ScriptModel(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_scriptmodel.h b/xfa/fxfa/parser/cxfa_scriptmodel.h index bb6cfd3fcb..40bc96ebc8 100644 --- a/xfa/fxfa/parser/cxfa_scriptmodel.h +++ b/xfa/fxfa/parser/cxfa_scriptmodel.h @@ -11,7 +11,7 @@ class CXFA_ScriptModel : public CXFA_Node { public: - CXFA_ScriptModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ScriptModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ScriptModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_select.cpp b/xfa/fxfa/parser/cxfa_select.cpp index 07f6909d60..690413b4ce 100644 --- a/xfa/fxfa/parser/cxfa_select.cpp +++ b/xfa/fxfa/parser/cxfa_select.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"select"; } // namespace -CXFA_Select::CXFA_Select(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Select::CXFA_Select(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_select.h b/xfa/fxfa/parser/cxfa_select.h index 99b99afb79..76651e07c9 100644 --- a/xfa/fxfa/parser/cxfa_select.h +++ b/xfa/fxfa/parser/cxfa_select.h @@ -11,7 +11,7 @@ class CXFA_Select : public CXFA_Node { public: - CXFA_Select(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Select(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Select() override; }; diff --git a/xfa/fxfa/parser/cxfa_setproperty.cpp b/xfa/fxfa/parser/cxfa_setproperty.cpp index 1bbcfdbd49..e98505bd3d 100644 --- a/xfa/fxfa/parser/cxfa_setproperty.cpp +++ b/xfa/fxfa/parser/cxfa_setproperty.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"setProperty"; } // namespace -CXFA_SetProperty::CXFA_SetProperty(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SetProperty::CXFA_SetProperty(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_setproperty.h b/xfa/fxfa/parser/cxfa_setproperty.h index 4add12ee43..3f8f430465 100644 --- a/xfa/fxfa/parser/cxfa_setproperty.h +++ b/xfa/fxfa/parser/cxfa_setproperty.h @@ -11,7 +11,7 @@ class CXFA_SetProperty : public CXFA_Node { public: - CXFA_SetProperty(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SetProperty(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SetProperty() override; }; diff --git a/xfa/fxfa/parser/cxfa_severity.cpp b/xfa/fxfa/parser/cxfa_severity.cpp index 23ce442f2b..53a91e8f31 100644 --- a/xfa/fxfa/parser/cxfa_severity.cpp +++ b/xfa/fxfa/parser/cxfa_severity.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"severity"; } // namespace -CXFA_Severity::CXFA_Severity(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Severity::CXFA_Severity(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_severity.h b/xfa/fxfa/parser/cxfa_severity.h index 9f9693e114..711445557a 100644 --- a/xfa/fxfa/parser/cxfa_severity.h +++ b/xfa/fxfa/parser/cxfa_severity.h @@ -11,7 +11,7 @@ class CXFA_Severity : public CXFA_Node { public: - CXFA_Severity(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Severity(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Severity() override; }; diff --git a/xfa/fxfa/parser/cxfa_sharptext.cpp b/xfa/fxfa/parser/cxfa_sharptext.cpp index 9043d998b5..5300dfc1c0 100644 --- a/xfa/fxfa/parser/cxfa_sharptext.cpp +++ b/xfa/fxfa/parser/cxfa_sharptext.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"#text"; } // namespace -CXFA_Sharptext::CXFA_Sharptext(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Sharptext::CXFA_Sharptext(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Config | diff --git a/xfa/fxfa/parser/cxfa_sharptext.h b/xfa/fxfa/parser/cxfa_sharptext.h index 3767289866..89a050b70b 100644 --- a/xfa/fxfa/parser/cxfa_sharptext.h +++ b/xfa/fxfa/parser/cxfa_sharptext.h @@ -11,7 +11,7 @@ class CXFA_Sharptext : public CXFA_Node { public: - CXFA_Sharptext(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Sharptext(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Sharptext() override; }; diff --git a/xfa/fxfa/parser/cxfa_sharpxhtml.cpp b/xfa/fxfa/parser/cxfa_sharpxhtml.cpp index 498a3892a1..51829b7745 100644 --- a/xfa/fxfa/parser/cxfa_sharpxhtml.cpp +++ b/xfa/fxfa/parser/cxfa_sharpxhtml.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"#xHTML"; } // namespace -CXFA_SharpxHTML::CXFA_SharpxHTML(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SharpxHTML::CXFA_SharpxHTML(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Config | diff --git a/xfa/fxfa/parser/cxfa_sharpxhtml.h b/xfa/fxfa/parser/cxfa_sharpxhtml.h index 048014e755..3f6cf793e2 100644 --- a/xfa/fxfa/parser/cxfa_sharpxhtml.h +++ b/xfa/fxfa/parser/cxfa_sharpxhtml.h @@ -11,7 +11,7 @@ class CXFA_SharpxHTML : public CXFA_Node { public: - CXFA_SharpxHTML(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SharpxHTML(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SharpxHTML() override; }; diff --git a/xfa/fxfa/parser/cxfa_sharpxml.cpp b/xfa/fxfa/parser/cxfa_sharpxml.cpp index 2636eb6aaa..6ce220efa6 100644 --- a/xfa/fxfa/parser/cxfa_sharpxml.cpp +++ b/xfa/fxfa/parser/cxfa_sharpxml.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"#xml"; } // namespace -CXFA_Sharpxml::CXFA_Sharpxml(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Sharpxml::CXFA_Sharpxml(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_sharpxml.h b/xfa/fxfa/parser/cxfa_sharpxml.h index f4e55cd205..a065857a42 100644 --- a/xfa/fxfa/parser/cxfa_sharpxml.h +++ b/xfa/fxfa/parser/cxfa_sharpxml.h @@ -11,7 +11,7 @@ class CXFA_Sharpxml : public CXFA_Node { public: - CXFA_Sharpxml(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Sharpxml(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Sharpxml() override; }; diff --git a/xfa/fxfa/parser/cxfa_signature.cpp b/xfa/fxfa/parser/cxfa_signature.cpp index 2640be7a8c..e5c1645519 100644 --- a/xfa/fxfa/parser/cxfa_signature.cpp +++ b/xfa/fxfa/parser/cxfa_signature.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"signature"; } // namespace -CXFA_Signature::CXFA_Signature(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Signature::CXFA_Signature(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_signature.h b/xfa/fxfa/parser/cxfa_signature.h index b70e29807a..f55ce5a115 100644 --- a/xfa/fxfa/parser/cxfa_signature.h +++ b/xfa/fxfa/parser/cxfa_signature.h @@ -11,7 +11,7 @@ class CXFA_Signature : public CXFA_Node { public: - CXFA_Signature(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Signature(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Signature() override; }; diff --git a/xfa/fxfa/parser/cxfa_signatureproperties.cpp b/xfa/fxfa/parser/cxfa_signatureproperties.cpp index c55d858572..c18706aaea 100644 --- a/xfa/fxfa/parser/cxfa_signatureproperties.cpp +++ b/xfa/fxfa/parser/cxfa_signatureproperties.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"signatureProperties"; } // namespace CXFA_SignatureProperties::CXFA_SignatureProperties(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_signatureproperties.h b/xfa/fxfa/parser/cxfa_signatureproperties.h index 3fce949f1f..800b780303 100644 --- a/xfa/fxfa/parser/cxfa_signatureproperties.h +++ b/xfa/fxfa/parser/cxfa_signatureproperties.h @@ -11,7 +11,7 @@ class CXFA_SignatureProperties : public CXFA_Node { public: - CXFA_SignatureProperties(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SignatureProperties(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SignatureProperties() override; }; diff --git a/xfa/fxfa/parser/cxfa_signaturepseudomodel.cpp b/xfa/fxfa/parser/cxfa_signaturepseudomodel.cpp index c65cc36209..0899e6277f 100644 --- a/xfa/fxfa/parser/cxfa_signaturepseudomodel.cpp +++ b/xfa/fxfa/parser/cxfa_signaturepseudomodel.cpp @@ -13,7 +13,7 @@ constexpr wchar_t kName[] = L"signaturePseudoModel"; } // namespace CXFA_SignaturePseudoModel::CXFA_SignaturePseudoModel(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_signaturepseudomodel.h b/xfa/fxfa/parser/cxfa_signaturepseudomodel.h index 53273b1808..bfb3dfb2ed 100644 --- a/xfa/fxfa/parser/cxfa_signaturepseudomodel.h +++ b/xfa/fxfa/parser/cxfa_signaturepseudomodel.h @@ -11,7 +11,7 @@ class CXFA_SignaturePseudoModel : public CXFA_Node { public: - CXFA_SignaturePseudoModel(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SignaturePseudoModel(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SignaturePseudoModel() override; }; diff --git a/xfa/fxfa/parser/cxfa_signdata.cpp b/xfa/fxfa/parser/cxfa_signdata.cpp index dcdb2bf26e..05d4c19947 100644 --- a/xfa/fxfa/parser/cxfa_signdata.cpp +++ b/xfa/fxfa/parser/cxfa_signdata.cpp @@ -25,7 +25,7 @@ constexpr wchar_t kName[] = L"signData"; } // namespace -CXFA_SignData::CXFA_SignData(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SignData::CXFA_SignData(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_signdata.h b/xfa/fxfa/parser/cxfa_signdata.h index 234ddeb13a..3ad39f5fac 100644 --- a/xfa/fxfa/parser/cxfa_signdata.h +++ b/xfa/fxfa/parser/cxfa_signdata.h @@ -11,7 +11,7 @@ class CXFA_SignData : public CXFA_Node { public: - CXFA_SignData(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SignData(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SignData() override; }; diff --git a/xfa/fxfa/parser/cxfa_signing.cpp b/xfa/fxfa/parser/cxfa_signing.cpp index 87b931ecff..5641efc696 100644 --- a/xfa/fxfa/parser/cxfa_signing.cpp +++ b/xfa/fxfa/parser/cxfa_signing.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"signing"; } // namespace -CXFA_Signing::CXFA_Signing(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Signing::CXFA_Signing(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_signing.h b/xfa/fxfa/parser/cxfa_signing.h index 0fe83cf240..6df9a1871d 100644 --- a/xfa/fxfa/parser/cxfa_signing.h +++ b/xfa/fxfa/parser/cxfa_signing.h @@ -11,7 +11,7 @@ class CXFA_Signing : public CXFA_Node { public: - CXFA_Signing(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Signing(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Signing() override; }; diff --git a/xfa/fxfa/parser/cxfa_silentprint.cpp b/xfa/fxfa/parser/cxfa_silentprint.cpp index eef75692db..ca0cf9f6a7 100644 --- a/xfa/fxfa/parser/cxfa_silentprint.cpp +++ b/xfa/fxfa/parser/cxfa_silentprint.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"silentPrint"; } // namespace -CXFA_SilentPrint::CXFA_SilentPrint(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SilentPrint::CXFA_SilentPrint(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_silentprint.h b/xfa/fxfa/parser/cxfa_silentprint.h index 7b1adc1371..6ef5fcf97b 100644 --- a/xfa/fxfa/parser/cxfa_silentprint.h +++ b/xfa/fxfa/parser/cxfa_silentprint.h @@ -11,7 +11,7 @@ class CXFA_SilentPrint : public CXFA_Node { public: - CXFA_SilentPrint(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SilentPrint(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SilentPrint() override; }; diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 515240341e..e5f3f688fe 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -314,8 +314,8 @@ CFX_XMLNode* CXFA_SimpleParser::ParseXMLData(const ByteString& wsXML) { void CXFA_SimpleParser::ConstructXFANode(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode) { - XFA_XDPPACKET ePacketID = (XFA_XDPPACKET)pXFANode->GetPacketID(); - if (ePacketID == XFA_XDPPACKET_Datasets) { + XFA_PacketType ePacketID = pXFANode->GetPacketType(); + if (ePacketID == XFA_PacketType::Datasets) { if (pXFANode->GetElementType() == XFA_Element::DataValue) { for (CFX_XMLNode* pXMLChild = pXMLNode->GetNodeItem(CFX_XMLNode::FirstChild); @@ -326,8 +326,8 @@ void CXFA_SimpleParser::ConstructXFANode(CXFA_Node* pXFANode, continue; if (eNodeType == FX_XMLNODE_Element) { - CXFA_Node* pXFAChild = m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, - XFA_Element::DataValue); + CXFA_Node* pXFAChild = m_pFactory->CreateNode( + XFA_PacketType::Datasets, XFA_Element::DataValue); if (!pXFAChild) return; @@ -403,29 +403,35 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket(CFX_XMLNode* pXMLDocumentNode, case XFA_XDPPACKET_UNKNOWN: return nullptr; case XFA_XDPPACKET_XDP: - return ParseAsXDPPacket_XDP(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_XDP(pXMLDocumentNode); case XFA_XDPPACKET_Config: - return ParseAsXDPPacket_Config(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_Config(pXMLDocumentNode, XFA_PacketType::Config); case XFA_XDPPACKET_Template: + return ParseAsXDPPacket_TemplateForm(pXMLDocumentNode, + XFA_PacketType::Template); case XFA_XDPPACKET_Form: - return ParseAsXDPPacket_TemplateForm(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_TemplateForm(pXMLDocumentNode, + XFA_PacketType::Form); case XFA_XDPPACKET_Datasets: - return ParseAsXDPPacket_Data(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_Data(pXMLDocumentNode); case XFA_XDPPACKET_Xdc: - return ParseAsXDPPacket_Xdc(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_Xdc(pXMLDocumentNode); case XFA_XDPPACKET_LocaleSet: + return ParseAsXDPPacket_LocaleConnectionSourceSet( + pXMLDocumentNode, XFA_PacketType::LocaleSet); case XFA_XDPPACKET_ConnectionSet: + return ParseAsXDPPacket_LocaleConnectionSourceSet( + pXMLDocumentNode, XFA_PacketType::ConnectionSet); case XFA_XDPPACKET_SourceSet: - return ParseAsXDPPacket_LocaleConnectionSourceSet(pXMLDocumentNode, - ePacketID); + return ParseAsXDPPacket_LocaleConnectionSourceSet( + pXMLDocumentNode, XFA_PacketType::SourceSet); default: - return ParseAsXDPPacket_User(pXMLDocumentNode, ePacketID); + return ParseAsXDPPacket_User(pXMLDocumentNode); } } CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( - CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + CFX_XMLNode* pXMLDocumentNode) { if (!MatchNodeName(pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::Xdp)->pName, XFA_GetPacketByIndex(XFA_PacketType::Xdp)->pURI, @@ -434,7 +440,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( } CXFA_Node* pXFARootNode = - m_pFactory->CreateNode(XFA_XDPPACKET_XDP, XFA_Element::Xfa); + m_pFactory->CreateNode(XFA_PacketType::Xdp, XFA_Element::Xfa); if (!pXFARootNode) return nullptr; @@ -468,7 +474,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( pXMLConfigDOMRoot = pChildItem; pXFAConfigDOMRoot = - ParseAsXDPPacket_Config(pXMLConfigDOMRoot, XFA_XDPPACKET_Config); + ParseAsXDPPacket_Config(pXMLConfigDOMRoot, XFA_PacketType::Config); if (pXFAConfigDOMRoot) pXFARootNode->InsertChild(pXFAConfigDOMRoot, nullptr); } @@ -555,7 +561,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP( CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Config( CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { if (!MatchNodeName(pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::Config)->pName, XFA_GetPacketByIndex(XFA_PacketType::Config)->pURI, @@ -563,7 +569,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Config( return nullptr; } CXFA_Node* pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_Config, XFA_Element::Config); + m_pFactory->CreateNode(XFA_PacketType::Config, XFA_Element::Config); if (!pNode) return nullptr; @@ -579,15 +585,15 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Config( CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm( CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { CXFA_Node* pNode = nullptr; - if (ePacketID == XFA_XDPPACKET_Template) { + if (ePacketID == XFA_PacketType::Template) { if (MatchNodeName(pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::Template)->pName, XFA_GetPacketByIndex(XFA_PacketType::Template)->pURI, XFA_GetPacketByIndex(XFA_PacketType::Template)->eFlags)) { - pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_Template, XFA_Element::Template); + pNode = m_pFactory->CreateNode(XFA_PacketType::Template, + XFA_Element::Template); if (!pNode) return nullptr; @@ -606,7 +612,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm( if (!NormalLoader(pNode, pXMLDocumentNode, ePacketID, true)) return nullptr; } - } else if (ePacketID == XFA_XDPPACKET_Form) { + } else if (ePacketID == XFA_PacketType::Form) { if (MatchNodeName(pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::Form)->pName, XFA_GetPacketByIndex(XFA_PacketType::Form)->pURI, @@ -630,7 +636,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm( if (bsCheck != wsChecksum.UTF8Encode()) return nullptr; - pNode = m_pFactory->CreateNode(XFA_XDPPACKET_Form, XFA_Element::Form); + pNode = m_pFactory->CreateNode(XFA_PacketType::Form, XFA_Element::Form); if (!pNode) return nullptr; @@ -662,12 +668,11 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm( } CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Data( - CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + CFX_XMLNode* pXMLDocumentNode) { CFX_XMLNode* pDatasetsXMLNode = GetDataSetsFromXDP(pXMLDocumentNode); if (pDatasetsXMLNode) { - CXFA_Node* pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataModel); + CXFA_Node* pNode = m_pFactory->CreateNode(XFA_PacketType::Datasets, + XFA_Element::DataModel); if (!pNode) return nullptr; @@ -705,8 +710,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Data( } if (pDataXMLNode) { - CXFA_Node* pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataGroup); + CXFA_Node* pNode = m_pFactory->CreateNode(XFA_PacketType::Datasets, + XFA_Element::DataGroup); if (!pNode) { if (pDataXMLNode != pXMLDocumentNode) delete pDataXMLNode; @@ -728,15 +733,15 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Data( CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_LocaleConnectionSourceSet( CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { CXFA_Node* pNode = nullptr; - if (ePacketID == XFA_XDPPACKET_LocaleSet) { + if (ePacketID == XFA_PacketType::LocaleSet) { if (MatchNodeName( pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::LocaleSet)->pName, XFA_GetPacketByIndex(XFA_PacketType::LocaleSet)->pURI, XFA_GetPacketByIndex(XFA_PacketType::LocaleSet)->eFlags)) { - pNode = m_pFactory->CreateNode(XFA_XDPPACKET_LocaleSet, + pNode = m_pFactory->CreateNode(XFA_PacketType::LocaleSet, XFA_Element::LocaleSet); if (!pNode) return nullptr; @@ -747,13 +752,13 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_LocaleConnectionSourceSet( if (!NormalLoader(pNode, pXMLDocumentNode, ePacketID, true)) return nullptr; } - } else if (ePacketID == XFA_XDPPACKET_ConnectionSet) { + } else if (ePacketID == XFA_PacketType::ConnectionSet) { if (MatchNodeName( pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::ConnectionSet)->pName, XFA_GetPacketByIndex(XFA_PacketType::ConnectionSet)->pURI, XFA_GetPacketByIndex(XFA_PacketType::ConnectionSet)->eFlags)) { - pNode = m_pFactory->CreateNode(XFA_XDPPACKET_ConnectionSet, + pNode = m_pFactory->CreateNode(XFA_PacketType::ConnectionSet, XFA_Element::ConnectionSet); if (!pNode) return nullptr; @@ -765,13 +770,13 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_LocaleConnectionSourceSet( if (!NormalLoader(pNode, pXMLDocumentNode, ePacketID, true)) return nullptr; } - } else if (ePacketID == XFA_XDPPACKET_SourceSet) { + } else if (ePacketID == XFA_PacketType::SourceSet) { if (MatchNodeName( pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::SourceSet)->pName, XFA_GetPacketByIndex(XFA_PacketType::SourceSet)->pURI, XFA_GetPacketByIndex(XFA_PacketType::SourceSet)->eFlags)) { - pNode = m_pFactory->CreateNode(XFA_XDPPACKET_SourceSet, + pNode = m_pFactory->CreateNode(XFA_PacketType::SourceSet, XFA_Element::SourceSet); if (!pNode) return nullptr; @@ -789,8 +794,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_LocaleConnectionSourceSet( } CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Xdc( - CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + CFX_XMLNode* pXMLDocumentNode) { if (!MatchNodeName(pXMLDocumentNode, XFA_GetPacketByIndex(XFA_PacketType::Xdc)->pName, XFA_GetPacketByIndex(XFA_PacketType::Xdc)->pURI, @@ -798,7 +802,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Xdc( return nullptr; CXFA_Node* pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_Xdc, XFA_Element::Xdc); + m_pFactory->CreateNode(XFA_PacketType::Xdc, XFA_Element::Xdc); if (!pNode) return nullptr; @@ -810,10 +814,9 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_Xdc( } CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_User( - CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID) { + CFX_XMLNode* pXMLDocumentNode) { CXFA_Node* pNode = - m_pFactory->CreateNode(XFA_XDPPACKET_XDP, XFA_Element::Packet); + m_pFactory->CreateNode(XFA_PacketType::Xdp, XFA_Element::Packet); if (!pNode) return nullptr; @@ -835,13 +838,13 @@ CXFA_Node* CXFA_SimpleParser::UserPacketLoader(CXFA_Node* pXFANode, CXFA_Node* CXFA_SimpleParser::DataLoader(CXFA_Node* pXFANode, CFX_XMLNode* pXMLDoc, bool bDoTransform) { - ParseDataGroup(pXFANode, pXMLDoc, XFA_XDPPACKET_Datasets); + ParseDataGroup(pXFANode, pXMLDoc, XFA_PacketType::Datasets); return pXFANode; } CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, CFX_XMLNode* pXMLDoc, - XFA_XDPPACKET ePacketID, + XFA_PacketType ePacketID, bool bUseAttribute) { bool bOneOfPropertyFound = false; for (CFX_XMLNode* pXMLChild = pXMLDoc->GetNodeItem(CFX_XMLNode::FirstChild); @@ -866,7 +869,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, CXFA_Node* pXFAChild = m_pFactory->CreateNode(ePacketID, eType); if (!pXFAChild) return nullptr; - if (ePacketID == XFA_XDPPACKET_Config) { + if (ePacketID == XFA_PacketType::Config) { pXFAChild->JSNode()->SetAttribute(XFA_Attribute::Name, wsTagName.AsStringView(), false); } @@ -892,7 +895,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, } pXFANode->InsertChild(pXFAChild, nullptr); if (eType == XFA_Element::Validate || eType == XFA_Element::Locale) { - if (ePacketID == XFA_XDPPACKET_Config) + if (ePacketID == XFA_PacketType::Config) ParseContentNode(pXFAChild, pXMLElement, ePacketID); else NormalLoader(pXFAChild, pXMLElement, ePacketID, bUseAttribute); @@ -925,7 +928,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, void CXFA_SimpleParser::ParseContentNode(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { XFA_Element element = XFA_Element::Sharptext; if (pXFANode->GetElementType() == XFA_Element::ExData) { WideString wsContentType = @@ -982,7 +985,7 @@ void CXFA_SimpleParser::ParseContentNode(CXFA_Node* pXFANode, void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { for (CFX_XMLNode* pXMLChild = pXMLNode->GetNodeItem(CFX_XMLNode::FirstChild); pXMLChild; pXMLChild = pXMLChild->GetNodeItem(CFX_XMLNode::NextSibling)) { @@ -1037,7 +1040,7 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, eNodeType = XFA_Element::DataValue; CXFA_Node* pXFAChild = - m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, eNodeType); + m_pFactory->CreateNode(XFA_PacketType::Datasets, eNodeType); if (!pXFAChild) return; @@ -1062,7 +1065,7 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, continue; } CXFA_Node* pXFAMetaData = m_pFactory->CreateNode( - XFA_XDPPACKET_Datasets, XFA_Element::DataValue); + XFA_PacketType::Datasets, XFA_Element::DataValue); if (!pXFAMetaData) return; @@ -1087,7 +1090,7 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, if (eNodeType == XFA_Element::DataGroup) ParseDataGroup(pXFAChild, pXMLElement, ePacketID); else if (bNeedValue) - ParseDataValue(pXFAChild, pXMLChild, XFA_XDPPACKET_Datasets); + ParseDataValue(pXFAChild, pXMLChild, XFA_PacketType::Datasets); pXFAChild->SetXMLMappingNode(pXMLElement); pXFAChild->SetFlag(XFA_NodeFlag_Initialized, false); @@ -1100,7 +1103,7 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, if (IsStringAllWhitespace(wsText)) continue; - CXFA_Node* pXFAChild = m_pFactory->CreateNode(XFA_XDPPACKET_Datasets, + CXFA_Node* pXFAChild = m_pFactory->CreateNode(XFA_PacketType::Datasets, XFA_Element::DataValue); if (!pXFAChild) return; @@ -1120,7 +1123,7 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, void CXFA_SimpleParser::ParseDataValue(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { CFX_WideTextBuf wsValueTextBuf; CFX_WideTextBuf wsCurValueTextBuf; bool bMarkAsCompound = false; @@ -1212,7 +1215,7 @@ void CXFA_SimpleParser::ParseDataValue(CXFA_Node* pXFANode, void CXFA_SimpleParser::ParseInstruction(CXFA_Node* pXFANode, CFX_XMLInstruction* pXMLInstruction, - XFA_XDPPACKET ePacketID) { + XFA_PacketType ePacketID) { if (!m_bDocumentParser) return; diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h index 00250e7257..f7465b64d6 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.h +++ b/xfa/fxfa/parser/cxfa_simple_parser.h @@ -39,24 +39,20 @@ class CXFA_SimpleParser { private: CXFA_Node* ParseAsXDPPacket(CFX_XMLNode* pXMLDocumentNode, XFA_XDPPACKET ePacketID); - CXFA_Node* ParseAsXDPPacket_XDP(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); + CXFA_Node* ParseAsXDPPacket_XDP(CFX_XMLNode* pXMLDocumentNode); CXFA_Node* ParseAsXDPPacket_Config(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); CXFA_Node* ParseAsXDPPacket_TemplateForm(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); - CXFA_Node* ParseAsXDPPacket_Data(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); + CXFA_Node* ParseAsXDPPacket_Data(CFX_XMLNode* pXMLDocumentNode); CXFA_Node* ParseAsXDPPacket_LocaleConnectionSourceSet( CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); - CXFA_Node* ParseAsXDPPacket_Xdc(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); - CXFA_Node* ParseAsXDPPacket_User(CFX_XMLNode* pXMLDocumentNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); + CXFA_Node* ParseAsXDPPacket_Xdc(CFX_XMLNode* pXMLDocumentNode); + CXFA_Node* ParseAsXDPPacket_User(CFX_XMLNode* pXMLDocumentNode); CXFA_Node* NormalLoader(CXFA_Node* pXFANode, CFX_XMLNode* pXMLDoc, - XFA_XDPPACKET ePacketID, + XFA_PacketType ePacketID, bool bUseAttribute); CXFA_Node* DataLoader(CXFA_Node* pXFANode, CFX_XMLNode* pXMLDoc, @@ -64,16 +60,16 @@ class CXFA_SimpleParser { CXFA_Node* UserPacketLoader(CXFA_Node* pXFANode, CFX_XMLNode* pXMLDoc); void ParseContentNode(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); void ParseDataValue(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); void ParseDataGroup(CXFA_Node* pXFANode, CFX_XMLNode* pXMLNode, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); void ParseInstruction(CXFA_Node* pXFANode, CFX_XMLInstruction* pXMLInstruction, - XFA_XDPPACKET ePacketID); + XFA_PacketType ePacketID); CFX_XMLParser* m_pXMLParser; std::unique_ptr<CFX_XMLDoc> m_pXMLDoc; diff --git a/xfa/fxfa/parser/cxfa_soapaction.cpp b/xfa/fxfa/parser/cxfa_soapaction.cpp index 9a2c76a9fb..b6aa0d15ae 100644 --- a/xfa/fxfa/parser/cxfa_soapaction.cpp +++ b/xfa/fxfa/parser/cxfa_soapaction.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"soapAction"; } // namespace -CXFA_SoapAction::CXFA_SoapAction(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SoapAction::CXFA_SoapAction(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_soapaction.h b/xfa/fxfa/parser/cxfa_soapaction.h index 9d24e6ef50..b803eae311 100644 --- a/xfa/fxfa/parser/cxfa_soapaction.h +++ b/xfa/fxfa/parser/cxfa_soapaction.h @@ -11,7 +11,7 @@ class CXFA_SoapAction : public CXFA_Node { public: - CXFA_SoapAction(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SoapAction(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SoapAction() override; }; diff --git a/xfa/fxfa/parser/cxfa_soapaddress.cpp b/xfa/fxfa/parser/cxfa_soapaddress.cpp index 671460fd95..9e857ad291 100644 --- a/xfa/fxfa/parser/cxfa_soapaddress.cpp +++ b/xfa/fxfa/parser/cxfa_soapaddress.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"soapAddress"; } // namespace -CXFA_SoapAddress::CXFA_SoapAddress(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SoapAddress::CXFA_SoapAddress(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_soapaddress.h b/xfa/fxfa/parser/cxfa_soapaddress.h index 17ab11f1c2..b0feff4427 100644 --- a/xfa/fxfa/parser/cxfa_soapaddress.h +++ b/xfa/fxfa/parser/cxfa_soapaddress.h @@ -11,7 +11,7 @@ class CXFA_SoapAddress : public CXFA_Node { public: - CXFA_SoapAddress(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SoapAddress(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SoapAddress() override; }; diff --git a/xfa/fxfa/parser/cxfa_solid.cpp b/xfa/fxfa/parser/cxfa_solid.cpp index 9d9d6e2a65..4a39ffbede 100644 --- a/xfa/fxfa/parser/cxfa_solid.cpp +++ b/xfa/fxfa/parser/cxfa_solid.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"solid"; } // namespace -CXFA_Solid::CXFA_Solid(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Solid::CXFA_Solid(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_solid.h b/xfa/fxfa/parser/cxfa_solid.h index 75936cde8a..ec1e2d08c6 100644 --- a/xfa/fxfa/parser/cxfa_solid.h +++ b/xfa/fxfa/parser/cxfa_solid.h @@ -11,7 +11,7 @@ class CXFA_Solid : public CXFA_Node { public: - CXFA_Solid(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Solid(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Solid() override; }; diff --git a/xfa/fxfa/parser/cxfa_source.cpp b/xfa/fxfa/parser/cxfa_source.cpp index bbe82429eb..98f2b94973 100644 --- a/xfa/fxfa/parser/cxfa_source.cpp +++ b/xfa/fxfa/parser/cxfa_source.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"source"; } // namespace -CXFA_Source::CXFA_Source(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Source::CXFA_Source(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_source.h b/xfa/fxfa/parser/cxfa_source.h index 9c249cd6a0..af74be89d9 100644 --- a/xfa/fxfa/parser/cxfa_source.h +++ b/xfa/fxfa/parser/cxfa_source.h @@ -11,7 +11,7 @@ class CXFA_Source : public CXFA_Node { public: - CXFA_Source(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Source(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Source() override; }; diff --git a/xfa/fxfa/parser/cxfa_sourceset.cpp b/xfa/fxfa/parser/cxfa_sourceset.cpp index 4fa642ffb1..2617c3041b 100644 --- a/xfa/fxfa/parser/cxfa_sourceset.cpp +++ b/xfa/fxfa/parser/cxfa_sourceset.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"sourceSet"; } // namespace -CXFA_SourceSet::CXFA_SourceSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SourceSet::CXFA_SourceSet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_sourceset.h b/xfa/fxfa/parser/cxfa_sourceset.h index 47f45ad65c..b07e12bd76 100644 --- a/xfa/fxfa/parser/cxfa_sourceset.h +++ b/xfa/fxfa/parser/cxfa_sourceset.h @@ -11,7 +11,7 @@ class CXFA_SourceSet : public CXFA_Node { public: - CXFA_SourceSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SourceSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SourceSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_speak.cpp b/xfa/fxfa/parser/cxfa_speak.cpp index 48e9aaf1e6..677fdfa6cf 100644 --- a/xfa/fxfa/parser/cxfa_speak.cpp +++ b/xfa/fxfa/parser/cxfa_speak.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"speak"; } // namespace -CXFA_Speak::CXFA_Speak(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Speak::CXFA_Speak(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_speak.h b/xfa/fxfa/parser/cxfa_speak.h index e45bf50c8a..80ef54b974 100644 --- a/xfa/fxfa/parser/cxfa_speak.h +++ b/xfa/fxfa/parser/cxfa_speak.h @@ -11,7 +11,7 @@ class CXFA_Speak : public CXFA_Node { public: - CXFA_Speak(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Speak(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Speak() override; }; diff --git a/xfa/fxfa/parser/cxfa_staple.cpp b/xfa/fxfa/parser/cxfa_staple.cpp index 8cf8c47d6a..2e29ad6d23 100644 --- a/xfa/fxfa/parser/cxfa_staple.cpp +++ b/xfa/fxfa/parser/cxfa_staple.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"staple"; } // namespace -CXFA_Staple::CXFA_Staple(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Staple::CXFA_Staple(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_staple.h b/xfa/fxfa/parser/cxfa_staple.h index b84301976b..9651fa4aa8 100644 --- a/xfa/fxfa/parser/cxfa_staple.h +++ b/xfa/fxfa/parser/cxfa_staple.h @@ -11,7 +11,7 @@ class CXFA_Staple : public CXFA_Node { public: - CXFA_Staple(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Staple(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Staple() override; }; diff --git a/xfa/fxfa/parser/cxfa_startnode.cpp b/xfa/fxfa/parser/cxfa_startnode.cpp index 2c4d680f22..f49b5957ef 100644 --- a/xfa/fxfa/parser/cxfa_startnode.cpp +++ b/xfa/fxfa/parser/cxfa_startnode.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"startNode"; } // namespace -CXFA_StartNode::CXFA_StartNode(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_StartNode::CXFA_StartNode(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_startnode.h b/xfa/fxfa/parser/cxfa_startnode.h index 048564d29f..51815e547f 100644 --- a/xfa/fxfa/parser/cxfa_startnode.h +++ b/xfa/fxfa/parser/cxfa_startnode.h @@ -11,7 +11,7 @@ class CXFA_StartNode : public CXFA_Node { public: - CXFA_StartNode(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_StartNode(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_StartNode() override; }; diff --git a/xfa/fxfa/parser/cxfa_startpage.cpp b/xfa/fxfa/parser/cxfa_startpage.cpp index 20e1bdca5e..c52daf2a33 100644 --- a/xfa/fxfa/parser/cxfa_startpage.cpp +++ b/xfa/fxfa/parser/cxfa_startpage.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"startPage"; } // namespace -CXFA_StartPage::CXFA_StartPage(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_StartPage::CXFA_StartPage(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_startpage.h b/xfa/fxfa/parser/cxfa_startpage.h index 0eceb878c5..6262aa7c95 100644 --- a/xfa/fxfa/parser/cxfa_startpage.h +++ b/xfa/fxfa/parser/cxfa_startpage.h @@ -11,7 +11,7 @@ class CXFA_StartPage : public CXFA_Node { public: - CXFA_StartPage(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_StartPage(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_StartPage() override; }; diff --git a/xfa/fxfa/parser/cxfa_stipple.cpp b/xfa/fxfa/parser/cxfa_stipple.cpp index b389d9b02f..5cf4bac0a5 100644 --- a/xfa/fxfa/parser/cxfa_stipple.cpp +++ b/xfa/fxfa/parser/cxfa_stipple.cpp @@ -22,7 +22,7 @@ constexpr wchar_t kName[] = L"stipple"; } // namespace -CXFA_Stipple::CXFA_Stipple(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Stipple::CXFA_Stipple(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_stipple.h b/xfa/fxfa/parser/cxfa_stipple.h index a662e481ca..2dddf4494d 100644 --- a/xfa/fxfa/parser/cxfa_stipple.h +++ b/xfa/fxfa/parser/cxfa_stipple.h @@ -11,7 +11,7 @@ class CXFA_Stipple : public CXFA_Node { public: - CXFA_Stipple(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Stipple(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Stipple() override; }; diff --git a/xfa/fxfa/parser/cxfa_subform.cpp b/xfa/fxfa/parser/cxfa_subform.cpp index 10d55805a4..a66b3159d1 100644 --- a/xfa/fxfa/parser/cxfa_subform.cpp +++ b/xfa/fxfa/parser/cxfa_subform.cpp @@ -60,7 +60,7 @@ constexpr wchar_t kName[] = L"subform"; } // namespace -CXFA_Subform::CXFA_Subform(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Subform::CXFA_Subform(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_subform.h b/xfa/fxfa/parser/cxfa_subform.h index 1c2f2af6a5..00b2e17dbc 100644 --- a/xfa/fxfa/parser/cxfa_subform.h +++ b/xfa/fxfa/parser/cxfa_subform.h @@ -11,7 +11,7 @@ class CXFA_Subform : public CXFA_Node { public: - CXFA_Subform(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Subform(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Subform() override; }; diff --git a/xfa/fxfa/parser/cxfa_subformset.cpp b/xfa/fxfa/parser/cxfa_subformset.cpp index 56c79e8963..74b940c159 100644 --- a/xfa/fxfa/parser/cxfa_subformset.cpp +++ b/xfa/fxfa/parser/cxfa_subformset.cpp @@ -27,7 +27,7 @@ constexpr wchar_t kName[] = L"subformSet"; } // namespace -CXFA_SubformSet::CXFA_SubformSet(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubformSet::CXFA_SubformSet(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_subformset.h b/xfa/fxfa/parser/cxfa_subformset.h index 4f7f7dcd17..8e0f3ea345 100644 --- a/xfa/fxfa/parser/cxfa_subformset.h +++ b/xfa/fxfa/parser/cxfa_subformset.h @@ -11,7 +11,7 @@ class CXFA_SubformSet : public CXFA_Node { public: - CXFA_SubformSet(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubformSet(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubformSet() override; }; diff --git a/xfa/fxfa/parser/cxfa_subjectdn.cpp b/xfa/fxfa/parser/cxfa_subjectdn.cpp index 65ee274558..d58f4d56d1 100644 --- a/xfa/fxfa/parser/cxfa_subjectdn.cpp +++ b/xfa/fxfa/parser/cxfa_subjectdn.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"subjectDN"; } // namespace -CXFA_SubjectDN::CXFA_SubjectDN(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubjectDN::CXFA_SubjectDN(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_subjectdn.h b/xfa/fxfa/parser/cxfa_subjectdn.h index e7782527f5..0861d754c4 100644 --- a/xfa/fxfa/parser/cxfa_subjectdn.h +++ b/xfa/fxfa/parser/cxfa_subjectdn.h @@ -11,7 +11,7 @@ class CXFA_SubjectDN : public CXFA_Node { public: - CXFA_SubjectDN(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubjectDN(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubjectDN() override; }; diff --git a/xfa/fxfa/parser/cxfa_subjectdns.cpp b/xfa/fxfa/parser/cxfa_subjectdns.cpp index 20d2b252a4..94457522b0 100644 --- a/xfa/fxfa/parser/cxfa_subjectdns.cpp +++ b/xfa/fxfa/parser/cxfa_subjectdns.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"subjectDNs"; } // namespace -CXFA_SubjectDNs::CXFA_SubjectDNs(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubjectDNs::CXFA_SubjectDNs(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_subjectdns.h b/xfa/fxfa/parser/cxfa_subjectdns.h index ba8cf07a85..e9d739cc12 100644 --- a/xfa/fxfa/parser/cxfa_subjectdns.h +++ b/xfa/fxfa/parser/cxfa_subjectdns.h @@ -11,7 +11,7 @@ class CXFA_SubjectDNs : public CXFA_Node { public: - CXFA_SubjectDNs(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubjectDNs(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubjectDNs() override; }; diff --git a/xfa/fxfa/parser/cxfa_submit.cpp b/xfa/fxfa/parser/cxfa_submit.cpp index 36bdbf0152..deb24aefb8 100644 --- a/xfa/fxfa/parser/cxfa_submit.cpp +++ b/xfa/fxfa/parser/cxfa_submit.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"submit"; } // namespace -CXFA_Submit::CXFA_Submit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Submit::CXFA_Submit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_submit.h b/xfa/fxfa/parser/cxfa_submit.h index 863d2109bf..2b9b5e8c69 100644 --- a/xfa/fxfa/parser/cxfa_submit.h +++ b/xfa/fxfa/parser/cxfa_submit.h @@ -11,7 +11,7 @@ class CXFA_Submit : public CXFA_Node { public: - CXFA_Submit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Submit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Submit() override; }; diff --git a/xfa/fxfa/parser/cxfa_submitformat.cpp b/xfa/fxfa/parser/cxfa_submitformat.cpp index 54ffe52d18..30daf89797 100644 --- a/xfa/fxfa/parser/cxfa_submitformat.cpp +++ b/xfa/fxfa/parser/cxfa_submitformat.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"submitFormat"; } // namespace -CXFA_SubmitFormat::CXFA_SubmitFormat(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubmitFormat::CXFA_SubmitFormat(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_submitformat.h b/xfa/fxfa/parser/cxfa_submitformat.h index 72febdf469..adca1e9d2a 100644 --- a/xfa/fxfa/parser/cxfa_submitformat.h +++ b/xfa/fxfa/parser/cxfa_submitformat.h @@ -11,7 +11,7 @@ class CXFA_SubmitFormat : public CXFA_Node { public: - CXFA_SubmitFormat(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubmitFormat(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubmitFormat() override; }; diff --git a/xfa/fxfa/parser/cxfa_submiturl.cpp b/xfa/fxfa/parser/cxfa_submiturl.cpp index 2f19a1d9fe..591dd99ac4 100644 --- a/xfa/fxfa/parser/cxfa_submiturl.cpp +++ b/xfa/fxfa/parser/cxfa_submiturl.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"submitUrl"; } // namespace -CXFA_SubmitUrl::CXFA_SubmitUrl(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubmitUrl::CXFA_SubmitUrl(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_submiturl.h b/xfa/fxfa/parser/cxfa_submiturl.h index 6d1b25f70c..8d87db9076 100644 --- a/xfa/fxfa/parser/cxfa_submiturl.h +++ b/xfa/fxfa/parser/cxfa_submiturl.h @@ -11,7 +11,7 @@ class CXFA_SubmitUrl : public CXFA_Node { public: - CXFA_SubmitUrl(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubmitUrl(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubmitUrl() override; }; diff --git a/xfa/fxfa/parser/cxfa_subsetbelow.cpp b/xfa/fxfa/parser/cxfa_subsetbelow.cpp index 7154877b94..90dbd064b8 100644 --- a/xfa/fxfa/parser/cxfa_subsetbelow.cpp +++ b/xfa/fxfa/parser/cxfa_subsetbelow.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"subsetBelow"; } // namespace -CXFA_SubsetBelow::CXFA_SubsetBelow(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_SubsetBelow::CXFA_SubsetBelow(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_subsetbelow.h b/xfa/fxfa/parser/cxfa_subsetbelow.h index e3ff516ad8..db912fef34 100644 --- a/xfa/fxfa/parser/cxfa_subsetbelow.h +++ b/xfa/fxfa/parser/cxfa_subsetbelow.h @@ -11,7 +11,7 @@ class CXFA_SubsetBelow : public CXFA_Node { public: - CXFA_SubsetBelow(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SubsetBelow(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SubsetBelow() override; }; diff --git a/xfa/fxfa/parser/cxfa_suppressbanner.cpp b/xfa/fxfa/parser/cxfa_suppressbanner.cpp index e1cfd92b0e..46c42a5c6a 100644 --- a/xfa/fxfa/parser/cxfa_suppressbanner.cpp +++ b/xfa/fxfa/parser/cxfa_suppressbanner.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"suppressBanner"; } // namespace CXFA_SuppressBanner::CXFA_SuppressBanner(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_suppressbanner.h b/xfa/fxfa/parser/cxfa_suppressbanner.h index ef3406bbd2..79013a2d05 100644 --- a/xfa/fxfa/parser/cxfa_suppressbanner.h +++ b/xfa/fxfa/parser/cxfa_suppressbanner.h @@ -11,7 +11,7 @@ class CXFA_SuppressBanner : public CXFA_Node { public: - CXFA_SuppressBanner(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_SuppressBanner(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_SuppressBanner() override; }; diff --git a/xfa/fxfa/parser/cxfa_tagged.cpp b/xfa/fxfa/parser/cxfa_tagged.cpp index ce9e15f540..0f46b62d4b 100644 --- a/xfa/fxfa/parser/cxfa_tagged.cpp +++ b/xfa/fxfa/parser/cxfa_tagged.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"tagged"; } // namespace -CXFA_Tagged::CXFA_Tagged(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Tagged::CXFA_Tagged(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_tagged.h b/xfa/fxfa/parser/cxfa_tagged.h index 14c55c2b3e..50b1ba44a5 100644 --- a/xfa/fxfa/parser/cxfa_tagged.h +++ b/xfa/fxfa/parser/cxfa_tagged.h @@ -11,7 +11,7 @@ class CXFA_Tagged : public CXFA_Node { public: - CXFA_Tagged(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Tagged(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Tagged() override; }; diff --git a/xfa/fxfa/parser/cxfa_template.cpp b/xfa/fxfa/parser/cxfa_template.cpp index b70bb533b1..28ae61b167 100644 --- a/xfa/fxfa/parser/cxfa_template.cpp +++ b/xfa/fxfa/parser/cxfa_template.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"template"; } // namespace -CXFA_Template::CXFA_Template(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Template::CXFA_Template(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_template.h b/xfa/fxfa/parser/cxfa_template.h index 4d41209f94..34b035fdc4 100644 --- a/xfa/fxfa/parser/cxfa_template.h +++ b/xfa/fxfa/parser/cxfa_template.h @@ -11,7 +11,7 @@ class CXFA_Template : public CXFA_Node { public: - CXFA_Template(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Template(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Template() override; }; diff --git a/xfa/fxfa/parser/cxfa_templatecache.cpp b/xfa/fxfa/parser/cxfa_templatecache.cpp index 9f407e4d4e..e22ed65805 100644 --- a/xfa/fxfa/parser/cxfa_templatecache.cpp +++ b/xfa/fxfa/parser/cxfa_templatecache.cpp @@ -18,7 +18,8 @@ constexpr wchar_t kName[] = L"templateCache"; } // namespace -CXFA_TemplateCache::CXFA_TemplateCache(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_TemplateCache::CXFA_TemplateCache(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_templatecache.h b/xfa/fxfa/parser/cxfa_templatecache.h index 3477f2e633..45953fe8f2 100644 --- a/xfa/fxfa/parser/cxfa_templatecache.h +++ b/xfa/fxfa/parser/cxfa_templatecache.h @@ -11,7 +11,7 @@ class CXFA_TemplateCache : public CXFA_Node { public: - CXFA_TemplateCache(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_TemplateCache(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_TemplateCache() override; }; diff --git a/xfa/fxfa/parser/cxfa_text.cpp b/xfa/fxfa/parser/cxfa_text.cpp index 816a5fc5c1..80b4eb2d7c 100644 --- a/xfa/fxfa/parser/cxfa_text.cpp +++ b/xfa/fxfa/parser/cxfa_text.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"text"; } // namespace -CXFA_Text::CXFA_Text(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Text::CXFA_Text(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | diff --git a/xfa/fxfa/parser/cxfa_text.h b/xfa/fxfa/parser/cxfa_text.h index 2bb5ef8d39..6883904b55 100644 --- a/xfa/fxfa/parser/cxfa_text.h +++ b/xfa/fxfa/parser/cxfa_text.h @@ -11,7 +11,7 @@ class CXFA_Text : public CXFA_Node { public: - CXFA_Text(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Text(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Text() override; }; diff --git a/xfa/fxfa/parser/cxfa_textedit.cpp b/xfa/fxfa/parser/cxfa_textedit.cpp index 17e96a0415..131fcc79fa 100644 --- a/xfa/fxfa/parser/cxfa_textedit.cpp +++ b/xfa/fxfa/parser/cxfa_textedit.cpp @@ -29,7 +29,7 @@ constexpr wchar_t kName[] = L"textEdit"; } // namespace -CXFA_TextEdit::CXFA_TextEdit(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_TextEdit::CXFA_TextEdit(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_textedit.h b/xfa/fxfa/parser/cxfa_textedit.h index 6fbae5d5fb..972ede40f3 100644 --- a/xfa/fxfa/parser/cxfa_textedit.h +++ b/xfa/fxfa/parser/cxfa_textedit.h @@ -11,7 +11,7 @@ class CXFA_TextEdit : public CXFA_Node { public: - CXFA_TextEdit(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_TextEdit(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_TextEdit() override; }; diff --git a/xfa/fxfa/parser/cxfa_threshold.cpp b/xfa/fxfa/parser/cxfa_threshold.cpp index b50c63afef..2047d52da7 100644 --- a/xfa/fxfa/parser/cxfa_threshold.cpp +++ b/xfa/fxfa/parser/cxfa_threshold.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"threshold"; } // namespace -CXFA_Threshold::CXFA_Threshold(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Threshold::CXFA_Threshold(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_threshold.h b/xfa/fxfa/parser/cxfa_threshold.h index 6625b22096..4bde01a215 100644 --- a/xfa/fxfa/parser/cxfa_threshold.h +++ b/xfa/fxfa/parser/cxfa_threshold.h @@ -11,7 +11,7 @@ class CXFA_Threshold : public CXFA_Node { public: - CXFA_Threshold(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Threshold(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Threshold() override; }; diff --git a/xfa/fxfa/parser/cxfa_time.cpp b/xfa/fxfa/parser/cxfa_time.cpp index 89307d69cd..e4c8705432 100644 --- a/xfa/fxfa/parser/cxfa_time.cpp +++ b/xfa/fxfa/parser/cxfa_time.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"time"; } // namespace -CXFA_Time::CXFA_Time(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Time::CXFA_Time(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_time.h b/xfa/fxfa/parser/cxfa_time.h index fe6f6629c3..efc6d02a4b 100644 --- a/xfa/fxfa/parser/cxfa_time.h +++ b/xfa/fxfa/parser/cxfa_time.h @@ -11,7 +11,7 @@ class CXFA_Time : public CXFA_Node { public: - CXFA_Time(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Time(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Time() override; }; diff --git a/xfa/fxfa/parser/cxfa_timepattern.cpp b/xfa/fxfa/parser/cxfa_timepattern.cpp index 5535e9f6a2..9424e8c940 100644 --- a/xfa/fxfa/parser/cxfa_timepattern.cpp +++ b/xfa/fxfa/parser/cxfa_timepattern.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"timePattern"; } // namespace -CXFA_TimePattern::CXFA_TimePattern(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_TimePattern::CXFA_TimePattern(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_timepattern.h b/xfa/fxfa/parser/cxfa_timepattern.h index 7bddbd2413..f796047c62 100644 --- a/xfa/fxfa/parser/cxfa_timepattern.h +++ b/xfa/fxfa/parser/cxfa_timepattern.h @@ -11,7 +11,7 @@ class CXFA_TimePattern : public CXFA_Node { public: - CXFA_TimePattern(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_TimePattern(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_TimePattern() override; }; diff --git a/xfa/fxfa/parser/cxfa_timepatterns.cpp b/xfa/fxfa/parser/cxfa_timepatterns.cpp index 7739e00709..c3a8dde6b4 100644 --- a/xfa/fxfa/parser/cxfa_timepatterns.cpp +++ b/xfa/fxfa/parser/cxfa_timepatterns.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"timePatterns"; } // namespace -CXFA_TimePatterns::CXFA_TimePatterns(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_TimePatterns::CXFA_TimePatterns(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_timepatterns.h b/xfa/fxfa/parser/cxfa_timepatterns.h index 827d241ecd..be9337d7c4 100644 --- a/xfa/fxfa/parser/cxfa_timepatterns.h +++ b/xfa/fxfa/parser/cxfa_timepatterns.h @@ -11,7 +11,7 @@ class CXFA_TimePatterns : public CXFA_Node { public: - CXFA_TimePatterns(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_TimePatterns(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_TimePatterns() override; }; diff --git a/xfa/fxfa/parser/cxfa_timestamp.cpp b/xfa/fxfa/parser/cxfa_timestamp.cpp index 3edd59ed2d..369a015678 100644 --- a/xfa/fxfa/parser/cxfa_timestamp.cpp +++ b/xfa/fxfa/parser/cxfa_timestamp.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"timeStamp"; } // namespace -CXFA_TimeStamp::CXFA_TimeStamp(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_TimeStamp::CXFA_TimeStamp(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_timestamp.h b/xfa/fxfa/parser/cxfa_timestamp.h index b35ed0530a..7db73e91c7 100644 --- a/xfa/fxfa/parser/cxfa_timestamp.h +++ b/xfa/fxfa/parser/cxfa_timestamp.h @@ -11,7 +11,7 @@ class CXFA_TimeStamp : public CXFA_Node { public: - CXFA_TimeStamp(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_TimeStamp(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_TimeStamp() override; }; diff --git a/xfa/fxfa/parser/cxfa_to.cpp b/xfa/fxfa/parser/cxfa_to.cpp index 678c13d388..a30c015625 100644 --- a/xfa/fxfa/parser/cxfa_to.cpp +++ b/xfa/fxfa/parser/cxfa_to.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"to"; } // namespace -CXFA_To::CXFA_To(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_To::CXFA_To(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_to.h b/xfa/fxfa/parser/cxfa_to.h index d7ea7d1017..f418f5996e 100644 --- a/xfa/fxfa/parser/cxfa_to.h +++ b/xfa/fxfa/parser/cxfa_to.h @@ -11,7 +11,7 @@ class CXFA_To : public CXFA_Node { public: - CXFA_To(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_To(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_To() override; }; diff --git a/xfa/fxfa/parser/cxfa_tooltip.cpp b/xfa/fxfa/parser/cxfa_tooltip.cpp index 5d4ecfa262..a8721bf936 100644 --- a/xfa/fxfa/parser/cxfa_tooltip.cpp +++ b/xfa/fxfa/parser/cxfa_tooltip.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"toolTip"; } // namespace -CXFA_ToolTip::CXFA_ToolTip(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_ToolTip::CXFA_ToolTip(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_tooltip.h b/xfa/fxfa/parser/cxfa_tooltip.h index a487a88726..0b13282e99 100644 --- a/xfa/fxfa/parser/cxfa_tooltip.h +++ b/xfa/fxfa/parser/cxfa_tooltip.h @@ -11,7 +11,7 @@ class CXFA_ToolTip : public CXFA_Node { public: - CXFA_ToolTip(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ToolTip(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ToolTip() override; }; diff --git a/xfa/fxfa/parser/cxfa_trace.cpp b/xfa/fxfa/parser/cxfa_trace.cpp index 64a872bef2..7de01fc132 100644 --- a/xfa/fxfa/parser/cxfa_trace.cpp +++ b/xfa/fxfa/parser/cxfa_trace.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"trace"; } // namespace -CXFA_Trace::CXFA_Trace(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Trace::CXFA_Trace(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_trace.h b/xfa/fxfa/parser/cxfa_trace.h index 113b739bfc..dec95da6af 100644 --- a/xfa/fxfa/parser/cxfa_trace.h +++ b/xfa/fxfa/parser/cxfa_trace.h @@ -11,7 +11,7 @@ class CXFA_Trace : public CXFA_Node { public: - CXFA_Trace(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Trace(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Trace() override; }; diff --git a/xfa/fxfa/parser/cxfa_transform.cpp b/xfa/fxfa/parser/cxfa_transform.cpp index d69d84f722..5bfa476a29 100644 --- a/xfa/fxfa/parser/cxfa_transform.cpp +++ b/xfa/fxfa/parser/cxfa_transform.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"transform"; } // namespace -CXFA_Transform::CXFA_Transform(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Transform::CXFA_Transform(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_transform.h b/xfa/fxfa/parser/cxfa_transform.h index 410cbd3ee7..fde54e6efa 100644 --- a/xfa/fxfa/parser/cxfa_transform.h +++ b/xfa/fxfa/parser/cxfa_transform.h @@ -11,7 +11,7 @@ class CXFA_Transform : public CXFA_Node { public: - CXFA_Transform(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Transform(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Transform() override; }; diff --git a/xfa/fxfa/parser/cxfa_traversal.cpp b/xfa/fxfa/parser/cxfa_traversal.cpp index 47e6822f0e..82a2845494 100644 --- a/xfa/fxfa/parser/cxfa_traversal.cpp +++ b/xfa/fxfa/parser/cxfa_traversal.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"traversal"; } // namespace -CXFA_Traversal::CXFA_Traversal(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Traversal::CXFA_Traversal(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_traversal.h b/xfa/fxfa/parser/cxfa_traversal.h index 15df49dd8e..47422b2fcb 100644 --- a/xfa/fxfa/parser/cxfa_traversal.h +++ b/xfa/fxfa/parser/cxfa_traversal.h @@ -11,7 +11,7 @@ class CXFA_Traversal : public CXFA_Node { public: - CXFA_Traversal(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Traversal(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Traversal() override; }; diff --git a/xfa/fxfa/parser/cxfa_traverse.cpp b/xfa/fxfa/parser/cxfa_traverse.cpp index 46018e3eae..f691ab827b 100644 --- a/xfa/fxfa/parser/cxfa_traverse.cpp +++ b/xfa/fxfa/parser/cxfa_traverse.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"traverse"; } // namespace -CXFA_Traverse::CXFA_Traverse(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Traverse::CXFA_Traverse(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_traverse.h b/xfa/fxfa/parser/cxfa_traverse.h index 09ca4dc0c3..de33cb7798 100644 --- a/xfa/fxfa/parser/cxfa_traverse.h +++ b/xfa/fxfa/parser/cxfa_traverse.h @@ -11,7 +11,7 @@ class CXFA_Traverse : public CXFA_Node { public: - CXFA_Traverse(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Traverse(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Traverse() override; }; diff --git a/xfa/fxfa/parser/cxfa_type.cpp b/xfa/fxfa/parser/cxfa_type.cpp index 3be441551a..ac1c193011 100644 --- a/xfa/fxfa/parser/cxfa_type.cpp +++ b/xfa/fxfa/parser/cxfa_type.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"type"; } // namespace -CXFA_Type::CXFA_Type(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Type::CXFA_Type(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_type.h b/xfa/fxfa/parser/cxfa_type.h index b9dfacd1c5..5e7d4672a1 100644 --- a/xfa/fxfa/parser/cxfa_type.h +++ b/xfa/fxfa/parser/cxfa_type.h @@ -11,7 +11,7 @@ class CXFA_Type : public CXFA_Node { public: - CXFA_Type(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Type(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Type() override; }; diff --git a/xfa/fxfa/parser/cxfa_typeface.cpp b/xfa/fxfa/parser/cxfa_typeface.cpp index 7c78bceaee..3bf69bdb2a 100644 --- a/xfa/fxfa/parser/cxfa_typeface.cpp +++ b/xfa/fxfa/parser/cxfa_typeface.cpp @@ -16,7 +16,7 @@ constexpr wchar_t kName[] = L"typeface"; } // namespace -CXFA_Typeface::CXFA_Typeface(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Typeface::CXFA_Typeface(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_typeface.h b/xfa/fxfa/parser/cxfa_typeface.h index 235abe4458..cbc90c4d41 100644 --- a/xfa/fxfa/parser/cxfa_typeface.h +++ b/xfa/fxfa/parser/cxfa_typeface.h @@ -11,7 +11,7 @@ class CXFA_Typeface : public CXFA_Node { public: - CXFA_Typeface(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Typeface(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Typeface() override; }; diff --git a/xfa/fxfa/parser/cxfa_typefaces.cpp b/xfa/fxfa/parser/cxfa_typefaces.cpp index 6cd89f4422..525919de0f 100644 --- a/xfa/fxfa/parser/cxfa_typefaces.cpp +++ b/xfa/fxfa/parser/cxfa_typefaces.cpp @@ -12,7 +12,7 @@ constexpr wchar_t kName[] = L"typefaces"; } // namespace -CXFA_Typefaces::CXFA_Typefaces(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Typefaces::CXFA_Typefaces(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_LocaleSet, diff --git a/xfa/fxfa/parser/cxfa_typefaces.h b/xfa/fxfa/parser/cxfa_typefaces.h index 8f55049939..fa4b43fb6e 100644 --- a/xfa/fxfa/parser/cxfa_typefaces.h +++ b/xfa/fxfa/parser/cxfa_typefaces.h @@ -11,7 +11,7 @@ class CXFA_Typefaces : public CXFA_Node { public: - CXFA_Typefaces(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Typefaces(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Typefaces() override; }; diff --git a/xfa/fxfa/parser/cxfa_ui.cpp b/xfa/fxfa/parser/cxfa_ui.cpp index d0d5c302f4..fabb853c97 100644 --- a/xfa/fxfa/parser/cxfa_ui.cpp +++ b/xfa/fxfa/parser/cxfa_ui.cpp @@ -34,7 +34,7 @@ constexpr wchar_t kName[] = L"ui"; } // namespace -CXFA_Ui::CXFA_Ui(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Ui::CXFA_Ui(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_ui.h b/xfa/fxfa/parser/cxfa_ui.h index cb43c7a38e..0824d6b88b 100644 --- a/xfa/fxfa/parser/cxfa_ui.h +++ b/xfa/fxfa/parser/cxfa_ui.h @@ -11,7 +11,7 @@ class CXFA_Ui : public CXFA_Node { public: - CXFA_Ui(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Ui(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Ui() override; }; diff --git a/xfa/fxfa/parser/cxfa_update.cpp b/xfa/fxfa/parser/cxfa_update.cpp index ff94e0141c..f9f9d1c8e7 100644 --- a/xfa/fxfa/parser/cxfa_update.cpp +++ b/xfa/fxfa/parser/cxfa_update.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"update"; } // namespace -CXFA_Update::CXFA_Update(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Update::CXFA_Update(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_update.h b/xfa/fxfa/parser/cxfa_update.h index a79626e57f..9e652eae56 100644 --- a/xfa/fxfa/parser/cxfa_update.h +++ b/xfa/fxfa/parser/cxfa_update.h @@ -11,7 +11,7 @@ class CXFA_Update : public CXFA_Node { public: - CXFA_Update(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Update(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Update() override; }; diff --git a/xfa/fxfa/parser/cxfa_uri.cpp b/xfa/fxfa/parser/cxfa_uri.cpp index d3c6166d8a..6cdffceabb 100644 --- a/xfa/fxfa/parser/cxfa_uri.cpp +++ b/xfa/fxfa/parser/cxfa_uri.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"uri"; } // namespace -CXFA_Uri::CXFA_Uri(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Uri::CXFA_Uri(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Config | XFA_XDPPACKET_ConnectionSet), diff --git a/xfa/fxfa/parser/cxfa_uri.h b/xfa/fxfa/parser/cxfa_uri.h index e82f824949..bb315964b6 100644 --- a/xfa/fxfa/parser/cxfa_uri.h +++ b/xfa/fxfa/parser/cxfa_uri.h @@ -11,7 +11,7 @@ class CXFA_Uri : public CXFA_Node { public: - CXFA_Uri(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Uri(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Uri() override; }; diff --git a/xfa/fxfa/parser/cxfa_user.cpp b/xfa/fxfa/parser/cxfa_user.cpp index 62a3634705..b8a7bda7c0 100644 --- a/xfa/fxfa/parser/cxfa_user.cpp +++ b/xfa/fxfa/parser/cxfa_user.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"user"; } // namespace -CXFA_User::CXFA_User(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_User::CXFA_User(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_SourceSet, diff --git a/xfa/fxfa/parser/cxfa_user.h b/xfa/fxfa/parser/cxfa_user.h index a2a03646dd..3aad173f54 100644 --- a/xfa/fxfa/parser/cxfa_user.h +++ b/xfa/fxfa/parser/cxfa_user.h @@ -11,7 +11,7 @@ class CXFA_User : public CXFA_Node { public: - CXFA_User(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_User(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_User() override; }; diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp index 9bf39e1aba..03066a75da 100644 --- a/xfa/fxfa/parser/cxfa_validate.cpp +++ b/xfa/fxfa/parser/cxfa_validate.cpp @@ -31,7 +31,7 @@ constexpr wchar_t kName[] = L"validate"; } // namespace -CXFA_Validate::CXFA_Validate(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Validate::CXFA_Validate(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node( doc, packet, diff --git a/xfa/fxfa/parser/cxfa_validate.h b/xfa/fxfa/parser/cxfa_validate.h index c21ed419a3..d19850cd77 100644 --- a/xfa/fxfa/parser/cxfa_validate.h +++ b/xfa/fxfa/parser/cxfa_validate.h @@ -11,7 +11,7 @@ class CXFA_Validate : public CXFA_Node { public: - CXFA_Validate(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Validate(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Validate() override; }; diff --git a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp index 971bbec959..f51131e50d 100644 --- a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp +++ b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"validateApprovalSignatures"; CXFA_ValidateApprovalSignatures::CXFA_ValidateApprovalSignatures( CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.h b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.h index 2922cb50e4..d7dac98d98 100644 --- a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.h +++ b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.h @@ -11,7 +11,7 @@ class CXFA_ValidateApprovalSignatures : public CXFA_Node { public: - CXFA_ValidateApprovalSignatures(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ValidateApprovalSignatures(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ValidateApprovalSignatures() override; }; diff --git a/xfa/fxfa/parser/cxfa_validationmessaging.cpp b/xfa/fxfa/parser/cxfa_validationmessaging.cpp index f7ff87739e..196c98c3eb 100644 --- a/xfa/fxfa/parser/cxfa_validationmessaging.cpp +++ b/xfa/fxfa/parser/cxfa_validationmessaging.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"validationMessaging"; } // namespace CXFA_ValidationMessaging::CXFA_ValidationMessaging(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_validationmessaging.h b/xfa/fxfa/parser/cxfa_validationmessaging.h index 3a493b4508..081b24c951 100644 --- a/xfa/fxfa/parser/cxfa_validationmessaging.h +++ b/xfa/fxfa/parser/cxfa_validationmessaging.h @@ -11,7 +11,7 @@ class CXFA_ValidationMessaging : public CXFA_Node { public: - CXFA_ValidationMessaging(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ValidationMessaging(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ValidationMessaging() override; }; diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index 02450b44a8..a97ac35efe 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -35,7 +35,7 @@ constexpr wchar_t kName[] = L"value"; } // namespace -CXFA_Value::CXFA_Value(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Value::CXFA_Value(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_value.h b/xfa/fxfa/parser/cxfa_value.h index b73d50d431..01f8c4a1ee 100644 --- a/xfa/fxfa/parser/cxfa_value.h +++ b/xfa/fxfa/parser/cxfa_value.h @@ -11,7 +11,7 @@ class CXFA_Value : public CXFA_Node { public: - CXFA_Value(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Value(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Value() override; }; diff --git a/xfa/fxfa/parser/cxfa_variables.cpp b/xfa/fxfa/parser/cxfa_variables.cpp index 0014c20d95..1942fb29ea 100644 --- a/xfa/fxfa/parser/cxfa_variables.cpp +++ b/xfa/fxfa/parser/cxfa_variables.cpp @@ -18,7 +18,7 @@ constexpr wchar_t kName[] = L"variables"; } // namespace -CXFA_Variables::CXFA_Variables(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Variables::CXFA_Variables(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), diff --git a/xfa/fxfa/parser/cxfa_variables.h b/xfa/fxfa/parser/cxfa_variables.h index 1f7b6fce60..4c4cb4ec5d 100644 --- a/xfa/fxfa/parser/cxfa_variables.h +++ b/xfa/fxfa/parser/cxfa_variables.h @@ -11,7 +11,7 @@ class CXFA_Variables : public CXFA_Node { public: - CXFA_Variables(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Variables(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Variables() override; }; diff --git a/xfa/fxfa/parser/cxfa_version.cpp b/xfa/fxfa/parser/cxfa_version.cpp index ac9d3083c3..5266f44619 100644 --- a/xfa/fxfa/parser/cxfa_version.cpp +++ b/xfa/fxfa/parser/cxfa_version.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"version"; } // namespace -CXFA_Version::CXFA_Version(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Version::CXFA_Version(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_version.h b/xfa/fxfa/parser/cxfa_version.h index ad50610dbd..34462fbd61 100644 --- a/xfa/fxfa/parser/cxfa_version.h +++ b/xfa/fxfa/parser/cxfa_version.h @@ -11,7 +11,7 @@ class CXFA_Version : public CXFA_Node { public: - CXFA_Version(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Version(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Version() override; }; diff --git a/xfa/fxfa/parser/cxfa_versioncontrol.cpp b/xfa/fxfa/parser/cxfa_versioncontrol.cpp index d2920dd07a..8830de7818 100644 --- a/xfa/fxfa/parser/cxfa_versioncontrol.cpp +++ b/xfa/fxfa/parser/cxfa_versioncontrol.cpp @@ -23,7 +23,7 @@ constexpr wchar_t kName[] = L"versionControl"; } // namespace CXFA_VersionControl::CXFA_VersionControl(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_versioncontrol.h b/xfa/fxfa/parser/cxfa_versioncontrol.h index 46c14181a7..4688f551f1 100644 --- a/xfa/fxfa/parser/cxfa_versioncontrol.h +++ b/xfa/fxfa/parser/cxfa_versioncontrol.h @@ -11,7 +11,7 @@ class CXFA_VersionControl : public CXFA_Node { public: - CXFA_VersionControl(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_VersionControl(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_VersionControl() override; }; diff --git a/xfa/fxfa/parser/cxfa_viewerpreferences.cpp b/xfa/fxfa/parser/cxfa_viewerpreferences.cpp index c3bbd27fad..1b80b479ed 100644 --- a/xfa/fxfa/parser/cxfa_viewerpreferences.cpp +++ b/xfa/fxfa/parser/cxfa_viewerpreferences.cpp @@ -29,7 +29,7 @@ constexpr wchar_t kName[] = L"viewerPreferences"; } // namespace CXFA_ViewerPreferences::CXFA_ViewerPreferences(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_viewerpreferences.h b/xfa/fxfa/parser/cxfa_viewerpreferences.h index 009ee03644..bf831eecb9 100644 --- a/xfa/fxfa/parser/cxfa_viewerpreferences.h +++ b/xfa/fxfa/parser/cxfa_viewerpreferences.h @@ -11,7 +11,7 @@ class CXFA_ViewerPreferences : public CXFA_Node { public: - CXFA_ViewerPreferences(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_ViewerPreferences(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_ViewerPreferences() override; }; diff --git a/xfa/fxfa/parser/cxfa_webclient.cpp b/xfa/fxfa/parser/cxfa_webclient.cpp index ceb6cb0461..012356069c 100644 --- a/xfa/fxfa/parser/cxfa_webclient.cpp +++ b/xfa/fxfa/parser/cxfa_webclient.cpp @@ -21,7 +21,7 @@ constexpr wchar_t kName[] = L"webClient"; } // namespace -CXFA_WebClient::CXFA_WebClient(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_WebClient::CXFA_WebClient(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_webclient.h b/xfa/fxfa/parser/cxfa_webclient.h index b902461a8c..b7786898f7 100644 --- a/xfa/fxfa/parser/cxfa_webclient.h +++ b/xfa/fxfa/parser/cxfa_webclient.h @@ -11,7 +11,7 @@ class CXFA_WebClient : public CXFA_Node { public: - CXFA_WebClient(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_WebClient(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_WebClient() override; }; diff --git a/xfa/fxfa/parser/cxfa_whitespace.cpp b/xfa/fxfa/parser/cxfa_whitespace.cpp index 874a3274dc..6359b86bd2 100644 --- a/xfa/fxfa/parser/cxfa_whitespace.cpp +++ b/xfa/fxfa/parser/cxfa_whitespace.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"whitespace"; } // namespace -CXFA_Whitespace::CXFA_Whitespace(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Whitespace::CXFA_Whitespace(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_whitespace.h b/xfa/fxfa/parser/cxfa_whitespace.h index 7ed50fe90d..62dde483ed 100644 --- a/xfa/fxfa/parser/cxfa_whitespace.h +++ b/xfa/fxfa/parser/cxfa_whitespace.h @@ -11,7 +11,7 @@ class CXFA_Whitespace : public CXFA_Node { public: - CXFA_Whitespace(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Whitespace(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Whitespace() override; }; diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 520a559bb4..9ceeb61f6c 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -115,7 +115,7 @@ CXFA_Node* CreateUIChild(CXFA_Node* pNode, XFA_Element& eWidgetType) { } auto node = CXFA_Node::Create(pChild->GetDocument(), XFA_Element::Ui, - XFA_XDPPACKET_Form); + XFA_PacketType::Form); if (node && node->HasPropertyFlags(eChildType, XFA_PROPERTYFLAG_OneOf)) { pUIChild = pChild; break; diff --git a/xfa/fxfa/parser/cxfa_window.cpp b/xfa/fxfa/parser/cxfa_window.cpp index d484076096..b1485f6891 100644 --- a/xfa/fxfa/parser/cxfa_window.cpp +++ b/xfa/fxfa/parser/cxfa_window.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"window"; } // namespace -CXFA_Window::CXFA_Window(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Window::CXFA_Window(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_window.h b/xfa/fxfa/parser/cxfa_window.h index b0bb1c66fb..852bc68b2c 100644 --- a/xfa/fxfa/parser/cxfa_window.h +++ b/xfa/fxfa/parser/cxfa_window.h @@ -11,7 +11,7 @@ class CXFA_Window : public CXFA_Node { public: - CXFA_Window(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Window(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Window() override; }; diff --git a/xfa/fxfa/parser/cxfa_wsdladdress.cpp b/xfa/fxfa/parser/cxfa_wsdladdress.cpp index c958d4182d..94707bc063 100644 --- a/xfa/fxfa/parser/cxfa_wsdladdress.cpp +++ b/xfa/fxfa/parser/cxfa_wsdladdress.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"wsdlAddress"; } // namespace -CXFA_WsdlAddress::CXFA_WsdlAddress(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_WsdlAddress::CXFA_WsdlAddress(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_wsdladdress.h b/xfa/fxfa/parser/cxfa_wsdladdress.h index ec99ae0e1e..83c965cbec 100644 --- a/xfa/fxfa/parser/cxfa_wsdladdress.h +++ b/xfa/fxfa/parser/cxfa_wsdladdress.h @@ -11,7 +11,7 @@ class CXFA_WsdlAddress : public CXFA_Node { public: - CXFA_WsdlAddress(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_WsdlAddress(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_WsdlAddress() override; }; diff --git a/xfa/fxfa/parser/cxfa_wsdlconnection.cpp b/xfa/fxfa/parser/cxfa_wsdlconnection.cpp index 370cd4f053..4c68a7ce68 100644 --- a/xfa/fxfa/parser/cxfa_wsdlconnection.cpp +++ b/xfa/fxfa/parser/cxfa_wsdlconnection.cpp @@ -26,7 +26,7 @@ constexpr wchar_t kName[] = L"wsdlConnection"; } // namespace CXFA_WsdlConnection::CXFA_WsdlConnection(CXFA_Document* doc, - XFA_XDPPACKET packet) + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_wsdlconnection.h b/xfa/fxfa/parser/cxfa_wsdlconnection.h index 70ebd871aa..6c349cf1d7 100644 --- a/xfa/fxfa/parser/cxfa_wsdlconnection.h +++ b/xfa/fxfa/parser/cxfa_wsdlconnection.h @@ -11,7 +11,7 @@ class CXFA_WsdlConnection : public CXFA_Node { public: - CXFA_WsdlConnection(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_WsdlConnection(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_WsdlConnection() override; }; diff --git a/xfa/fxfa/parser/cxfa_xdc.cpp b/xfa/fxfa/parser/cxfa_xdc.cpp index 2578c432bf..daaebc874b 100644 --- a/xfa/fxfa/parser/cxfa_xdc.cpp +++ b/xfa/fxfa/parser/cxfa_xdc.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"xdc"; } // namespace -CXFA_Xdc::CXFA_Xdc(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Xdc::CXFA_Xdc(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, (XFA_XDPPACKET_Config | XFA_XDPPACKET_Xdc), diff --git a/xfa/fxfa/parser/cxfa_xdc.h b/xfa/fxfa/parser/cxfa_xdc.h index e64c91c7d2..0eb43d5501 100644 --- a/xfa/fxfa/parser/cxfa_xdc.h +++ b/xfa/fxfa/parser/cxfa_xdc.h @@ -11,7 +11,7 @@ class CXFA_Xdc : public CXFA_Node { public: - CXFA_Xdc(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Xdc(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Xdc() override; }; diff --git a/xfa/fxfa/parser/cxfa_xdp.cpp b/xfa/fxfa/parser/cxfa_xdp.cpp index cb090f3954..f100ae887c 100644 --- a/xfa/fxfa/parser/cxfa_xdp.cpp +++ b/xfa/fxfa/parser/cxfa_xdp.cpp @@ -19,7 +19,7 @@ constexpr wchar_t kName[] = L"xdp"; } // namespace -CXFA_Xdp::CXFA_Xdp(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Xdp::CXFA_Xdp(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_xdp.h b/xfa/fxfa/parser/cxfa_xdp.h index dbd1ef31ee..38b450e98a 100644 --- a/xfa/fxfa/parser/cxfa_xdp.h +++ b/xfa/fxfa/parser/cxfa_xdp.h @@ -11,7 +11,7 @@ class CXFA_Xdp : public CXFA_Node { public: - CXFA_Xdp(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Xdp(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Xdp() override; }; diff --git a/xfa/fxfa/parser/cxfa_xfa.cpp b/xfa/fxfa/parser/cxfa_xfa.cpp index 9fc6dc379a..cd7f0ce106 100644 --- a/xfa/fxfa/parser/cxfa_xfa.cpp +++ b/xfa/fxfa/parser/cxfa_xfa.cpp @@ -17,7 +17,7 @@ constexpr wchar_t kName[] = L"xfa"; } // namespace -CXFA_Xfa::CXFA_Xfa(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Xfa::CXFA_Xfa(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_XDP, diff --git a/xfa/fxfa/parser/cxfa_xfa.h b/xfa/fxfa/parser/cxfa_xfa.h index f821cbbcdb..137b60191c 100644 --- a/xfa/fxfa/parser/cxfa_xfa.h +++ b/xfa/fxfa/parser/cxfa_xfa.h @@ -11,7 +11,7 @@ class CXFA_Xfa : public CXFA_Node { public: - CXFA_Xfa(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Xfa(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Xfa() override; }; diff --git a/xfa/fxfa/parser/cxfa_xmlconnection.cpp b/xfa/fxfa/parser/cxfa_xmlconnection.cpp index c67f68419e..7d341bf3cd 100644 --- a/xfa/fxfa/parser/cxfa_xmlconnection.cpp +++ b/xfa/fxfa/parser/cxfa_xmlconnection.cpp @@ -19,7 +19,8 @@ constexpr wchar_t kName[] = L"xmlConnection"; } // namespace -CXFA_XmlConnection::CXFA_XmlConnection(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_XmlConnection::CXFA_XmlConnection(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_xmlconnection.h b/xfa/fxfa/parser/cxfa_xmlconnection.h index d2ce3eb50b..f9158c6368 100644 --- a/xfa/fxfa/parser/cxfa_xmlconnection.h +++ b/xfa/fxfa/parser/cxfa_xmlconnection.h @@ -11,7 +11,7 @@ class CXFA_XmlConnection : public CXFA_Node { public: - CXFA_XmlConnection(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_XmlConnection(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_XmlConnection() override; }; diff --git a/xfa/fxfa/parser/cxfa_xsdconnection.cpp b/xfa/fxfa/parser/cxfa_xsdconnection.cpp index 45fc5137a4..d0453d15a1 100644 --- a/xfa/fxfa/parser/cxfa_xsdconnection.cpp +++ b/xfa/fxfa/parser/cxfa_xsdconnection.cpp @@ -21,7 +21,8 @@ constexpr wchar_t kName[] = L"xsdConnection"; } // namespace -CXFA_XsdConnection::CXFA_XsdConnection(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_XsdConnection::CXFA_XsdConnection(CXFA_Document* doc, + XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_ConnectionSet, diff --git a/xfa/fxfa/parser/cxfa_xsdconnection.h b/xfa/fxfa/parser/cxfa_xsdconnection.h index 2d0af3f037..652d45e15d 100644 --- a/xfa/fxfa/parser/cxfa_xsdconnection.h +++ b/xfa/fxfa/parser/cxfa_xsdconnection.h @@ -11,7 +11,7 @@ class CXFA_XsdConnection : public CXFA_Node { public: - CXFA_XsdConnection(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_XsdConnection(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_XsdConnection() override; }; diff --git a/xfa/fxfa/parser/cxfa_xsl.cpp b/xfa/fxfa/parser/cxfa_xsl.cpp index 0cbced114e..4d5e71ee53 100644 --- a/xfa/fxfa/parser/cxfa_xsl.cpp +++ b/xfa/fxfa/parser/cxfa_xsl.cpp @@ -20,7 +20,7 @@ constexpr wchar_t kName[] = L"xsl"; } // namespace -CXFA_Xsl::CXFA_Xsl(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Xsl::CXFA_Xsl(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_xsl.h b/xfa/fxfa/parser/cxfa_xsl.h index 9ad29bfee4..d9211250ae 100644 --- a/xfa/fxfa/parser/cxfa_xsl.h +++ b/xfa/fxfa/parser/cxfa_xsl.h @@ -11,7 +11,7 @@ class CXFA_Xsl : public CXFA_Node { public: - CXFA_Xsl(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Xsl(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Xsl() override; }; diff --git a/xfa/fxfa/parser/cxfa_zpl.cpp b/xfa/fxfa/parser/cxfa_zpl.cpp index 2ded6d0e5c..aa078b5168 100644 --- a/xfa/fxfa/parser/cxfa_zpl.cpp +++ b/xfa/fxfa/parser/cxfa_zpl.cpp @@ -24,7 +24,7 @@ constexpr wchar_t kName[] = L"zpl"; } // namespace -CXFA_Zpl::CXFA_Zpl(CXFA_Document* doc, XFA_XDPPACKET packet) +CXFA_Zpl::CXFA_Zpl(CXFA_Document* doc, XFA_PacketType packet) : CXFA_Node(doc, packet, XFA_XDPPACKET_Config, diff --git a/xfa/fxfa/parser/cxfa_zpl.h b/xfa/fxfa/parser/cxfa_zpl.h index e987a7fe47..ee8f9251b8 100644 --- a/xfa/fxfa/parser/cxfa_zpl.h +++ b/xfa/fxfa/parser/cxfa_zpl.h @@ -11,7 +11,7 @@ class CXFA_Zpl : public CXFA_Node { public: - CXFA_Zpl(CXFA_Document* doc, XFA_XDPPACKET packet); + CXFA_Zpl(CXFA_Document* doc, XFA_PacketType packet); ~CXFA_Zpl() override; }; diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index b2df645ebc..55a642584b 100644 --- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp +++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp @@ -68,7 +68,7 @@ bool FormValueNode_SetChildContent(CXFA_Node* pValueNode, if (!pValueNode) return false; - ASSERT(pValueNode->GetPacketID() == XFA_XDPPACKET_Form); + ASSERT(pValueNode->GetPacketType() == XFA_PacketType::Form); CXFA_Node* pChildNode = FormValueNode_CreateChild(pValueNode, iType); if (!pChildNode) return false; @@ -377,7 +377,8 @@ CXFA_Node* ScopeMatchGlobalBinding(CXFA_Node* pDataScope, XFA_Element eMatchDataNodeType, bool bUpLevel) { for (CXFA_Node *pCurDataScope = pDataScope, *pLastDataScope = nullptr; - pCurDataScope && pCurDataScope->GetPacketID() == XFA_XDPPACKET_Datasets; + pCurDataScope && + pCurDataScope->GetPacketType() == XFA_PacketType::Datasets; pLastDataScope = pCurDataScope, pCurDataScope = pCurDataScope->GetNodeItem(XFA_NODEITEM_Parent)) { @@ -436,7 +437,8 @@ CXFA_Node* FindOnceDataNode(CXFA_Document* pDocument, uint32_t dwNameHash = FX_HashCode_GetW(wsName.AsStringView(), false); CXFA_Node* pLastDataScope = nullptr; for (CXFA_Node* pCurDataScope = pDataScope; - pCurDataScope && pCurDataScope->GetPacketID() == XFA_XDPPACKET_Datasets; + pCurDataScope && + pCurDataScope->GetPacketType() == XFA_PacketType::Datasets; pCurDataScope = pCurDataScope->GetNodeItem(XFA_NODEITEM_Parent)) { for (CXFA_Node* pDataChild = pCurDataScope->GetFirstChildByName(dwNameHash); pDataChild; @@ -535,7 +537,7 @@ CXFA_Node* CloneOrMergeInstanceManager(CXFA_Document* pDocument, } CXFA_Node* pNewNode = - pDocument->CreateNode(XFA_XDPPACKET_Form, XFA_Element::InstanceManager); + pDocument->CreateNode(XFA_PacketType::Form, XFA_Element::InstanceManager); wsInstMgrNodeName = L"_" + pTemplateNode->JSNode()->GetCData(XFA_Attribute::Name); pNewNode->JSNode()->SetCData(XFA_Attribute::Name, wsInstMgrNodeName, false, @@ -1022,7 +1024,7 @@ CXFA_Node* MaybeCreateDataNode(CXFA_Document* pDocument, CXFA_Node* pParentDDNode = pDataParent->GetDataDescriptionNode(); if (!pParentDDNode) { CXFA_Node* pDataNode = - pDocument->CreateNode(XFA_XDPPACKET_Datasets, eNodeType); + pDocument->CreateNode(XFA_PacketType::Datasets, eNodeType); pDataNode->JSNode()->SetCData(XFA_Attribute::Name, wsName, false, false); pDataNode->CreateXMLMappingNode(); pDataParent->InsertChild(pDataNode, nullptr); @@ -1051,7 +1053,7 @@ CXFA_Node* MaybeCreateDataNode(CXFA_Document* pDocument, break; CXFA_Node* pDataNode = - pDocument->CreateNode(XFA_XDPPACKET_Datasets, eNodeType); + pDocument->CreateNode(XFA_PacketType::Datasets, eNodeType); pDataNode->JSNode()->SetCData(XFA_Attribute::Name, wsName, false, false); pDataNode->CreateXMLMappingNode(); if (eNodeType == XFA_Element::DataValue && @@ -1375,7 +1377,8 @@ void CXFA_Document::DoDataMerge() { CFX_XMLElement* pDatasetsXMLNode = new CFX_XMLElement(L"xfa:datasets"); pDatasetsXMLNode->SetString(L"xmlns:xfa", L"http://www.xfa.org/schema/xfa-data/1.0/"); - pDatasetsRoot = CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataModel); + pDatasetsRoot = + CreateNode(XFA_PacketType::Datasets, XFA_Element::DataModel); pDatasetsRoot->JSNode()->SetCData(XFA_Attribute::Name, L"datasets", false, false); m_pRootNode->GetXMLMappingNode()->InsertChildNode(pDatasetsXMLNode); @@ -1413,7 +1416,7 @@ void CXFA_Document::DoDataMerge() { if (!pDataRoot) { CFX_XMLElement* pDataRootXMLNode = new CFX_XMLElement(L"xfa:data"); - pDataRoot = CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataGroup); + pDataRoot = CreateNode(XFA_PacketType::Datasets, XFA_Element::DataGroup); pDataRoot->JSNode()->SetCData(XFA_Attribute::Name, L"data", false, false); pDataRoot->SetXMLMappingNode(pDataRootXMLNode); pDatasetsRoot->InsertChild(pDataRoot, nullptr); @@ -1441,7 +1444,7 @@ void CXFA_Document::DoDataMerge() { bool bEmptyForm = false; if (!pFormRoot) { bEmptyForm = true; - pFormRoot = CreateNode(XFA_XDPPACKET_Form, XFA_Element::Form); + pFormRoot = CreateNode(XFA_PacketType::Form, XFA_Element::Form); ASSERT(pFormRoot); pFormRoot->JSNode()->SetCData(XFA_Attribute::Name, L"form", false, false); m_pRootNode->InsertChild(pFormRoot, nullptr); @@ -1464,7 +1467,8 @@ void CXFA_Document::DoDataMerge() { CFX_XMLElement* pDataTopLevelXMLNode = new CFX_XMLElement(wsDataTopLevelName); - pDataTopLevel = CreateNode(XFA_XDPPACKET_Datasets, XFA_Element::DataGroup); + pDataTopLevel = + CreateNode(XFA_PacketType::Datasets, XFA_Element::DataGroup); pDataTopLevel->JSNode()->SetCData(XFA_Attribute::Name, wsDataTopLevelName, false, false); pDataTopLevel->SetXMLMappingNode(pDataTopLevelXMLNode); |