diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-30 20:22:20 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-30 20:22:20 +0000 |
| commit | 21b08271e32f3142fb840b04adc5d2adb15f4f78 (patch) | |
| tree | 2ce227f28759af44ddc9d66c81f3b83e6d5e01d0 /xfa/fxfa/parser | |
| parent | 5fda35f2b0a658e310f778c2dc40ef24e6d05975 (diff) | |
| download | pdfium-21b08271e32f3142fb840b04adc5d2adb15f4f78.tar.xz | |
Remove the packets from attribute data.
Now that the attributes are stored per node we don't need to store the
packets for a given attribute as the node is already restricted to
certain packets.
Change-Id: Ic8916f5e045a14a437e1487445c0742e6d5def44
Reviewed-on: https://pdfium-review.googlesource.com/19830
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser')
286 files changed, 1291 insertions, 3445 deletions
diff --git a/xfa/fxfa/parser/cxfa_accessiblecontent.cpp b/xfa/fxfa/parser/cxfa_accessiblecontent.cpp index 8c5bd8e47a..f603d208ee 100644 --- a/xfa/fxfa/parser/cxfa_accessiblecontent.cpp +++ b/xfa/fxfa/parser/cxfa_accessiblecontent.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"accessibleContent"; diff --git a/xfa/fxfa/parser/cxfa_acrobat.cpp b/xfa/fxfa/parser/cxfa_acrobat.cpp index 63358ad908..88f3928a55 100644 --- a/xfa/fxfa/parser/cxfa_acrobat.cpp +++ b/xfa/fxfa/parser/cxfa_acrobat.cpp @@ -16,11 +16,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Common, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"acrobat"; diff --git a/xfa/fxfa/parser/cxfa_acrobat7.cpp b/xfa/fxfa/parser/cxfa_acrobat7.cpp index d25e898c44..860cf1d3e1 100644 --- a/xfa/fxfa/parser/cxfa_acrobat7.cpp +++ b/xfa/fxfa/parser/cxfa_acrobat7.cpp @@ -12,11 +12,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::DynamicRender, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"acrobat7"; diff --git a/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp b/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp index 3ce756fc7f..1ecca4e95a 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp +++ b/xfa/fxfa/parser/cxfa_adbe_jsconsole.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ADBE_JSConsole"; diff --git a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp index 46a3956291..eefcdb0f90 100644 --- a/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp +++ b/xfa/fxfa/parser/cxfa_adbe_jsdebugger.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ADBE_JSDebugger"; diff --git a/xfa/fxfa/parser/cxfa_addsilentprint.cpp b/xfa/fxfa/parser/cxfa_addsilentprint.cpp index ed48cf9c05..4dc1acf32c 100644 --- a/xfa/fxfa/parser/cxfa_addsilentprint.cpp +++ b/xfa/fxfa/parser/cxfa_addsilentprint.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"addSilentPrint"; diff --git a/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp b/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp index 4fb1aecb05..6cfa024e82 100644 --- a/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp +++ b/xfa/fxfa/parser/cxfa_addviewerpreferences.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"addViewerPreferences"; diff --git a/xfa/fxfa/parser/cxfa_adjustdata.cpp b/xfa/fxfa/parser/cxfa_adjustdata.cpp index d665f28e20..cf58242b0e 100644 --- a/xfa/fxfa/parser/cxfa_adjustdata.cpp +++ b/xfa/fxfa/parser/cxfa_adjustdata.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"adjustData"; diff --git a/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp b/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp index 3c36ff0712..d03728c662 100644 --- a/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp +++ b/xfa/fxfa/parser/cxfa_adobeextensionlevel.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"adobeExtensionLevel"; diff --git a/xfa/fxfa/parser/cxfa_agent.cpp b/xfa/fxfa/parser/cxfa_agent.cpp index 622d30d817..3dcd75ecff 100644 --- a/xfa/fxfa/parser/cxfa_agent.cpp +++ b/xfa/fxfa/parser/cxfa_agent.cpp @@ -9,16 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"agent"; diff --git a/xfa/fxfa/parser/cxfa_alwaysembed.cpp b/xfa/fxfa/parser/cxfa_alwaysembed.cpp index 26b3eb7013..0138a9b88e 100644 --- a/xfa/fxfa/parser/cxfa_alwaysembed.cpp +++ b/xfa/fxfa/parser/cxfa_alwaysembed.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"alwaysEmbed"; diff --git a/xfa/fxfa/parser/cxfa_amd.cpp b/xfa/fxfa/parser/cxfa_amd.cpp index 3bc0846e7b..b174c1a8bd 100644 --- a/xfa/fxfa/parser/cxfa_amd.cpp +++ b/xfa/fxfa/parser/cxfa_amd.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"amd"; diff --git a/xfa/fxfa/parser/cxfa_appearancefilter.cpp b/xfa/fxfa/parser/cxfa_appearancefilter.cpp index 46c15c08ad..eb8b449dba 100644 --- a/xfa/fxfa/parser/cxfa_appearancefilter.cpp +++ b/xfa/fxfa/parser/cxfa_appearancefilter.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"appearanceFilter"; diff --git a/xfa/fxfa/parser/cxfa_arc.cpp b/xfa/fxfa/parser/cxfa_arc.cpp index 2451025bd1..3465420166 100644 --- a/xfa/fxfa/parser/cxfa_arc.cpp +++ b/xfa/fxfa/parser/cxfa_arc.cpp @@ -12,28 +12,15 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Edge, 1, 0}, {XFA_Element::Fill, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::StartAngle, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::SweepAngle, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)360}, - {XFA_Attribute::Circular, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::StartAngle, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::SweepAngle, XFA_AttributeType::Integer, (void*)360}, + {XFA_Attribute::Circular, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Hand, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Even}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"arc"; diff --git a/xfa/fxfa/parser/cxfa_area.cpp b/xfa/fxfa/parser/cxfa_area.cpp index b1a8f81db0..d3007fbf67 100644 --- a/xfa/fxfa/parser/cxfa_area.cpp +++ b/xfa/fxfa/parser/cxfa_area.cpp @@ -12,38 +12,17 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Desc, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Level, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Level, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"area"; diff --git a/xfa/fxfa/parser/cxfa_assist.cpp b/xfa/fxfa/parser/cxfa_assist.cpp index e6e48b0612..fbf42c2f05 100644 --- a/xfa/fxfa/parser/cxfa_assist.cpp +++ b/xfa/fxfa/parser/cxfa_assist.cpp @@ -12,21 +12,11 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::ToolTip, 1, 0}, {XFA_Element::Speak, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Role, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Role, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"assist"; diff --git a/xfa/fxfa/parser/cxfa_attributes.cpp b/xfa/fxfa/parser/cxfa_attributes.cpp index 8a8e5c1e51..e9406ef0e8 100644 --- a/xfa/fxfa/parser/cxfa_attributes.cpp +++ b/xfa/fxfa/parser/cxfa_attributes.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"attributes"; diff --git a/xfa/fxfa/parser/cxfa_autosave.cpp b/xfa/fxfa/parser/cxfa_autosave.cpp index d30225758f..1ab6eb9298 100644 --- a/xfa/fxfa/parser/cxfa_autosave.cpp +++ b/xfa/fxfa/parser/cxfa_autosave.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"autoSave"; diff --git a/xfa/fxfa/parser/cxfa_barcode.cpp b/xfa/fxfa/parser/cxfa_barcode.cpp index a6604e6c7f..f81e6caa13 100644 --- a/xfa/fxfa/parser/cxfa_barcode.cpp +++ b/xfa/fxfa/parser/cxfa_barcode.cpp @@ -9,59 +9,32 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataRowCount, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataRowCount, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::DataPrep, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Type, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)nullptr}, + {XFA_Attribute::Type, XFA_AttributeType::CData, (void*)nullptr}, {XFA_Attribute::TextLocation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Below}, - {XFA_Attribute::ModuleWidth, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0.25mm"}, - {XFA_Attribute::PrintCheckDigit, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::ModuleHeight, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"5mm"}, - {XFA_Attribute::StartChar, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Truncate, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::WideNarrowRatio, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"3:1"}, - {XFA_Attribute::ErrorCorrectionLevel, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::ModuleWidth, XFA_AttributeType::Measure, (void*)L"0.25mm"}, + {XFA_Attribute::PrintCheckDigit, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::ModuleHeight, XFA_AttributeType::Measure, (void*)L"5mm"}, + {XFA_Attribute::StartChar, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Truncate, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::WideNarrowRatio, XFA_AttributeType::CData, (void*)L"3:1"}, + {XFA_Attribute::ErrorCorrectionLevel, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::UpsMode, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_UsCarrier}, {XFA_Attribute::Checksum, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::CharEncoding, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"UTF-8"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataColumnCount, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::RowColumnRatio, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::DataLength, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::EndChar, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::CharEncoding, XFA_AttributeType::CData, (void*)L"UTF-8"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataColumnCount, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::RowColumnRatio, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataLength, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::EndChar, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"barcode"; diff --git a/xfa/fxfa/parser/cxfa_base.cpp b/xfa/fxfa/parser/cxfa_base.cpp index 8f0b847703..106049b610 100644 --- a/xfa/fxfa/parser/cxfa_base.cpp +++ b/xfa/fxfa/parser/cxfa_base.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"base"; diff --git a/xfa/fxfa/parser/cxfa_batchoutput.cpp b/xfa/fxfa/parser/cxfa_batchoutput.cpp index 63cab9d3d7..e11a6d7cf7 100644 --- a/xfa/fxfa/parser/cxfa_batchoutput.cpp +++ b/xfa/fxfa/parser/cxfa_batchoutput.cpp @@ -10,13 +10,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Format, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"batchOutput"; diff --git a/xfa/fxfa/parser/cxfa_behavioroverride.cpp b/xfa/fxfa/parser/cxfa_behavioroverride.cpp index abff3f75ec..6ae3a3d05b 100644 --- a/xfa/fxfa/parser/cxfa_behavioroverride.cpp +++ b/xfa/fxfa/parser/cxfa_behavioroverride.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"behaviorOverride"; diff --git a/xfa/fxfa/parser/cxfa_bind.cpp b/xfa/fxfa/parser/cxfa_bind.cpp index aa820b72b6..d188010789 100644 --- a/xfa/fxfa/parser/cxfa_bind.cpp +++ b/xfa/fxfa/parser/cxfa_bind.cpp @@ -11,38 +11,17 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Picture, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ContentType, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ContentType, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TransferEncoding, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Match, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Once}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"bind"; diff --git a/xfa/fxfa/parser/cxfa_binditems.cpp b/xfa/fxfa/parser/cxfa_binditems.cpp index dff27ab3ca..f7e7eace67 100644 --- a/xfa/fxfa/parser/cxfa_binditems.cpp +++ b/xfa/fxfa/parser/cxfa_binditems.cpp @@ -9,17 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Connection, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::LabelRef, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ValueRef, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Connection, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::LabelRef, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ValueRef, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"bindItems"; diff --git a/xfa/fxfa/parser/cxfa_bookend.cpp b/xfa/fxfa/parser/cxfa_bookend.cpp index a63640f469..a057595c7b 100644 --- a/xfa/fxfa/parser/cxfa_bookend.cpp +++ b/xfa/fxfa/parser/cxfa_bookend.cpp @@ -9,23 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Trailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Leader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Trailer, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Leader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"bookend"; diff --git a/xfa/fxfa/parser/cxfa_boolean.cpp b/xfa/fxfa/parser/cxfa_boolean.cpp index fadce7509d..0d49c98179 100644 --- a/xfa/fxfa/parser/cxfa_boolean.cpp +++ b/xfa/fxfa/parser/cxfa_boolean.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"boolean"; diff --git a/xfa/fxfa/parser/cxfa_border.cpp b/xfa/fxfa/parser/cxfa_border.cpp index 5250001f3e..d2a2afa89f 100644 --- a/xfa/fxfa/parser/cxfa_border.cpp +++ b/xfa/fxfa/parser/cxfa_border.cpp @@ -13,30 +13,17 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Corner, 4, 0}, {XFA_Element::Fill, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Break, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Close}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Hand, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Even}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"border"; diff --git a/xfa/fxfa/parser/cxfa_break.cpp b/xfa/fxfa/parser/cxfa_break.cpp index 3f8a7fd7d6..7bbd3a8d80 100644 --- a/xfa/fxfa/parser/cxfa_break.cpp +++ b/xfa/fxfa/parser/cxfa_break.cpp @@ -11,41 +11,22 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::BeforeTarget, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::OverflowTarget, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::OverflowLeader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::OverflowTrailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::BookendTrailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::BeforeTarget, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowTarget, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowLeader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::OverflowTrailer, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::BookendTrailer, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::After, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::BookendLeader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::AfterTarget, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::BookendLeader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AfterTarget, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Before, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"break"; diff --git a/xfa/fxfa/parser/cxfa_breakafter.cpp b/xfa/fxfa/parser/cxfa_breakafter.cpp index b46c3e2818..46d244cd90 100644 --- a/xfa/fxfa/parser/cxfa_breakafter.cpp +++ b/xfa/fxfa/parser/cxfa_breakafter.cpp @@ -11,30 +11,16 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Script, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Trailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Trailer, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TargetType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Leader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Leader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"breakAfter"; diff --git a/xfa/fxfa/parser/cxfa_breakbefore.cpp b/xfa/fxfa/parser/cxfa_breakbefore.cpp index 4322edb025..5b712f7976 100644 --- a/xfa/fxfa/parser/cxfa_breakbefore.cpp +++ b/xfa/fxfa/parser/cxfa_breakbefore.cpp @@ -11,30 +11,16 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Script, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Trailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::StartNew, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Trailer, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TargetType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Leader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Leader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"breakBefore"; diff --git a/xfa/fxfa/parser/cxfa_button.cpp b/xfa/fxfa/parser/cxfa_button.cpp index b1fccf29e9..0191a94306 100644 --- a/xfa/fxfa/parser/cxfa_button.cpp +++ b/xfa/fxfa/parser/cxfa_button.cpp @@ -11,22 +11,12 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Highlight, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Inverted}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"button"; diff --git a/xfa/fxfa/parser/cxfa_cache.cpp b/xfa/fxfa/parser/cxfa_cache.cpp index 3cce1b18a0..55cbaf94c6 100644 --- a/xfa/fxfa/parser/cxfa_cache.cpp +++ b/xfa/fxfa/parser/cxfa_cache.cpp @@ -12,11 +12,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::TemplateCache, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"cache"; diff --git a/xfa/fxfa/parser/cxfa_calculate.cpp b/xfa/fxfa/parser/cxfa_calculate.cpp index c9e9813c4a..a4a1d040b9 100644 --- a/xfa/fxfa/parser/cxfa_calculate.cpp +++ b/xfa/fxfa/parser/cxfa_calculate.cpp @@ -13,22 +13,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Message, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Override, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Error}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"calculate"; diff --git a/xfa/fxfa/parser/cxfa_calendarsymbols.cpp b/xfa/fxfa/parser/cxfa_calendarsymbols.cpp index 6f7ddef38b..0fb8b621fa 100644 --- a/xfa/fxfa/parser/cxfa_calendarsymbols.cpp +++ b/xfa/fxfa/parser/cxfa_calendarsymbols.cpp @@ -16,11 +16,8 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Gregorian}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"calendarSymbols"; diff --git a/xfa/fxfa/parser/cxfa_caption.cpp b/xfa/fxfa/parser/cxfa_caption.cpp index a040c1f4c8..7998cf338d 100644 --- a/xfa/fxfa/parser/cxfa_caption.cpp +++ b/xfa/fxfa/parser/cxfa_caption.cpp @@ -13,27 +13,15 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Font, 1, 0}, {XFA_Element::Value, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Reserve, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"-1un"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Reserve, XFA_AttributeType::Measure, (void*)L"-1un"}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Placement, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"caption"; diff --git a/xfa/fxfa/parser/cxfa_certificate.cpp b/xfa/fxfa/parser/cxfa_certificate.cpp index 3e54069aef..e7ccffc925 100644 --- a/xfa/fxfa/parser/cxfa_certificate.cpp +++ b/xfa/fxfa/parser/cxfa_certificate.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"certificate"; diff --git a/xfa/fxfa/parser/cxfa_certificates.cpp b/xfa/fxfa/parser/cxfa_certificates.cpp index 308b0859c3..16a77ce254 100644 --- a/xfa/fxfa/parser/cxfa_certificates.cpp +++ b/xfa/fxfa/parser/cxfa_certificates.cpp @@ -13,26 +13,14 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Issuers, 1, 0}, {XFA_Element::Signing, 1, 0}, {XFA_Element::Oids, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Url, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Url, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::CredentialServerPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::UrlPolicy, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::UrlPolicy, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"certificates"; diff --git a/xfa/fxfa/parser/cxfa_change.cpp b/xfa/fxfa/parser/cxfa_change.cpp index b3083f89dc..c8bee056a5 100644 --- a/xfa/fxfa/parser/cxfa_change.cpp +++ b/xfa/fxfa/parser/cxfa_change.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"change"; diff --git a/xfa/fxfa/parser/cxfa_checkbutton.cpp b/xfa/fxfa/parser/cxfa_checkbutton.cpp index 5b321f497c..6260e45915 100644 --- a/xfa/fxfa/parser/cxfa_checkbutton.cpp +++ b/xfa/fxfa/parser/cxfa_checkbutton.cpp @@ -13,29 +13,16 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::AllowNeutral, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AllowNeutral, XFA_AttributeType::Boolean, (void*)0}, {XFA_Attribute::Mark, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Default}, {XFA_Attribute::Shape, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, - {XFA_Attribute::Size, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"10pt"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Size, XFA_AttributeType::Measure, (void*)L"10pt"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"checkButton"; diff --git a/xfa/fxfa/parser/cxfa_choicelist.cpp b/xfa/fxfa/parser/cxfa_choicelist.cpp index 42062eb57c..a8e88ea2fa 100644 --- a/xfa/fxfa/parser/cxfa_choicelist.cpp +++ b/xfa/fxfa/parser/cxfa_choicelist.cpp @@ -13,27 +13,15 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Open, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_UserControl}, {XFA_Attribute::CommitOn, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Select}, - {XFA_Attribute::TextEntry, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::TextEntry, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"choiceList"; diff --git a/xfa/fxfa/parser/cxfa_color.cpp b/xfa/fxfa/parser/cxfa_color.cpp index 91defedf0a..524621860e 100644 --- a/xfa/fxfa/parser/cxfa_color.cpp +++ b/xfa/fxfa/parser/cxfa_color.cpp @@ -11,26 +11,12 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::CSpace, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"SRGB"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::CSpace, XFA_AttributeType::CData, (void*)L"SRGB"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"color"; diff --git a/xfa/fxfa/parser/cxfa_comb.cpp b/xfa/fxfa/parser/cxfa_comb.cpp index 7cffb91d56..de28a7affb 100644 --- a/xfa/fxfa/parser/cxfa_comb.cpp +++ b/xfa/fxfa/parser/cxfa_comb.cpp @@ -9,21 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::NumberOfCells, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::NumberOfCells, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"comb"; diff --git a/xfa/fxfa/parser/cxfa_command.cpp b/xfa/fxfa/parser/cxfa_command.cpp index 82ebad29b8..7f03dddbaa 100644 --- a/xfa/fxfa/parser/cxfa_command.cpp +++ b/xfa/fxfa/parser/cxfa_command.cpp @@ -14,26 +14,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Query, 1, 0}, {XFA_Element::Delete, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Timeout, XFA_AttributeType::Integer, - XFA_XDPPACKET_SourceSet, (void*)30}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Timeout, XFA_AttributeType::Integer, (void*)30}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"command"; diff --git a/xfa/fxfa/parser/cxfa_common.cpp b/xfa/fxfa/parser/cxfa_common.cpp index f9bda6c32e..bf25b9dc1a 100644 --- a/xfa/fxfa/parser/cxfa_common.cpp +++ b/xfa/fxfa/parser/cxfa_common.cpp @@ -19,11 +19,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Messaging, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"common"; diff --git a/xfa/fxfa/parser/cxfa_compress.cpp b/xfa/fxfa/parser/cxfa_compress.cpp index 2e06abe1ad..54eb10c7e1 100644 --- a/xfa/fxfa/parser/cxfa_compress.cpp +++ b/xfa/fxfa/parser/cxfa_compress.cpp @@ -9,14 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Scope, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ImageOnly}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"compress"; diff --git a/xfa/fxfa/parser/cxfa_compression.cpp b/xfa/fxfa/parser/cxfa_compression.cpp index 46ab7a07cf..1efbc55899 100644 --- a/xfa/fxfa/parser/cxfa_compression.cpp +++ b/xfa/fxfa/parser/cxfa_compression.cpp @@ -15,11 +15,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::CompressLogicalStructure, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"compression"; diff --git a/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp b/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp index b79f333786..e2798ffb7c 100644 --- a/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp +++ b/xfa/fxfa/parser/cxfa_compresslogicalstructure.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"compressLogicalStructure"; diff --git a/xfa/fxfa/parser/cxfa_compressobjectstream.cpp b/xfa/fxfa/parser/cxfa_compressobjectstream.cpp index c9804240ed..e42b7a77e2 100644 --- a/xfa/fxfa/parser/cxfa_compressobjectstream.cpp +++ b/xfa/fxfa/parser/cxfa_compressobjectstream.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"compressObjectStream"; diff --git a/xfa/fxfa/parser/cxfa_config.cpp b/xfa/fxfa/parser/cxfa_config.cpp index 3b7dd9de6e..104b90784c 100644 --- a/xfa/fxfa/parser/cxfa_config.cpp +++ b/xfa/fxfa/parser/cxfa_config.cpp @@ -13,11 +13,9 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Present, 1, 0}, {XFA_Element::Trace, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"config"; diff --git a/xfa/fxfa/parser/cxfa_conformance.cpp b/xfa/fxfa/parser/cxfa_conformance.cpp index 7ad8ac0221..a86a327fd8 100644 --- a/xfa/fxfa/parser/cxfa_conformance.cpp +++ b/xfa/fxfa/parser/cxfa_conformance.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"conformance"; diff --git a/xfa/fxfa/parser/cxfa_connect.cpp b/xfa/fxfa/parser/cxfa_connect.cpp index 9f33eb7a47..1490718fad 100644 --- a/xfa/fxfa/parser/cxfa_connect.cpp +++ b/xfa/fxfa/parser/cxfa_connect.cpp @@ -15,37 +15,17 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Password, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Timeout, XFA_AttributeType::Integer, - XFA_XDPPACKET_SourceSet, (void*)15}, - {XFA_Attribute::Connection, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Timeout, XFA_AttributeType::Integer, (void*)15}, + {XFA_Attribute::Connection, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Usage, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ExportAndImport}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DelayedOpen, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DelayedOpen, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"connect"; diff --git a/xfa/fxfa/parser/cxfa_connectstring.cpp b/xfa/fxfa/parser/cxfa_connectstring.cpp index 1cd29cf766..0d3b5a01d7 100644 --- a/xfa/fxfa/parser/cxfa_connectstring.cpp +++ b/xfa/fxfa/parser/cxfa_connectstring.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"connectString"; diff --git a/xfa/fxfa/parser/cxfa_contentarea.cpp b/xfa/fxfa/parser/cxfa_contentarea.cpp index e59405015e..42492a6f3c 100644 --- a/xfa/fxfa/parser/cxfa_contentarea.cpp +++ b/xfa/fxfa/parser/cxfa_contentarea.cpp @@ -12,36 +12,16 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Desc, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::H, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::W, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::H, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::W, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"contentArea"; diff --git a/xfa/fxfa/parser/cxfa_contentcopy.cpp b/xfa/fxfa/parser/cxfa_contentcopy.cpp index 887073dd71..57e42afbfd 100644 --- a/xfa/fxfa/parser/cxfa_contentcopy.cpp +++ b/xfa/fxfa/parser/cxfa_contentcopy.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"contentCopy"; diff --git a/xfa/fxfa/parser/cxfa_copies.cpp b/xfa/fxfa/parser/cxfa_copies.cpp index 9e76df3016..06bbea18f9 100644 --- a/xfa/fxfa/parser/cxfa_copies.cpp +++ b/xfa/fxfa/parser/cxfa_copies.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"copies"; diff --git a/xfa/fxfa/parser/cxfa_corner.cpp b/xfa/fxfa/parser/cxfa_corner.cpp index 199aaf8ec6..124be2b14f 100644 --- a/xfa/fxfa/parser/cxfa_corner.cpp +++ b/xfa/fxfa/parser/cxfa_corner.cpp @@ -12,34 +12,19 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Stroke, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Solid}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Inverted, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Thickness, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0.5pt"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Inverted, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Thickness, XFA_AttributeType::Measure, (void*)L"0.5pt"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Join, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, - {XFA_Attribute::Radius, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Radius, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"corner"; diff --git a/xfa/fxfa/parser/cxfa_creator.cpp b/xfa/fxfa/parser/cxfa_creator.cpp index 0b96e743db..234391b215 100644 --- a/xfa/fxfa/parser/cxfa_creator.cpp +++ b/xfa/fxfa/parser/cxfa_creator.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"creator"; diff --git a/xfa/fxfa/parser/cxfa_currencysymbol.cpp b/xfa/fxfa/parser/cxfa_currencysymbol.cpp index 0ce4e10267..3f60e3d298 100644 --- a/xfa/fxfa/parser/cxfa_currencysymbol.cpp +++ b/xfa/fxfa/parser/cxfa_currencysymbol.cpp @@ -10,11 +10,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Symbol}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"currencySymbol"; diff --git a/xfa/fxfa/parser/cxfa_currentpage.cpp b/xfa/fxfa/parser/cxfa_currentpage.cpp index fac71a9eef..b4d89bcf14 100644 --- a/xfa/fxfa/parser/cxfa_currentpage.cpp +++ b/xfa/fxfa/parser/cxfa_currentpage.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"currentPage"; diff --git a/xfa/fxfa/parser/cxfa_data.cpp b/xfa/fxfa/parser/cxfa_data.cpp index 1b81b85672..45374f8dae 100644 --- a/xfa/fxfa/parser/cxfa_data.cpp +++ b/xfa/fxfa/parser/cxfa_data.cpp @@ -16,11 +16,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Range, 1, 0}, {XFA_Element::IncrementalLoad, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"data"; diff --git a/xfa/fxfa/parser/cxfa_datagroup.cpp b/xfa/fxfa/parser/cxfa_datagroup.cpp index 33fbd80c58..e2d5b30500 100644 --- a/xfa/fxfa/parser/cxfa_datagroup.cpp +++ b/xfa/fxfa/parser/cxfa_datagroup.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dataGroup"; diff --git a/xfa/fxfa/parser/cxfa_datavalue.cpp b/xfa/fxfa/parser/cxfa_datavalue.cpp index 2aa11e06c0..b1d1f6ee8c 100644 --- a/xfa/fxfa/parser/cxfa_datavalue.cpp +++ b/xfa/fxfa/parser/cxfa_datavalue.cpp @@ -9,25 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ContentType, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Contains, XFA_AttributeType::Enum, XFA_XDPPACKET_Datasets, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ContentType, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Contains, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_Data}, - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::IsNull, XFA_AttributeType::Boolean, XFA_XDPPACKET_Datasets, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::IsNull, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dataValue"; diff --git a/xfa/fxfa/parser/cxfa_date.cpp b/xfa/fxfa/parser/cxfa_date.cpp index e58d8255e9..76eba5be81 100644 --- a/xfa/fxfa/parser/cxfa_date.cpp +++ b/xfa/fxfa/parser/cxfa_date.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"date"; diff --git a/xfa/fxfa/parser/cxfa_datepattern.cpp b/xfa/fxfa/parser/cxfa_datepattern.cpp index 88023a4d9a..4fbecb671b 100644 --- a/xfa/fxfa/parser/cxfa_datepattern.cpp +++ b/xfa/fxfa/parser/cxfa_datepattern.cpp @@ -10,11 +10,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Med}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"datePattern"; diff --git a/xfa/fxfa/parser/cxfa_datetime.cpp b/xfa/fxfa/parser/cxfa_datetime.cpp index 534d916f1a..a1c6fe826c 100644 --- a/xfa/fxfa/parser/cxfa_datetime.cpp +++ b/xfa/fxfa/parser/cxfa_datetime.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dateTime"; diff --git a/xfa/fxfa/parser/cxfa_datetimeedit.cpp b/xfa/fxfa/parser/cxfa_datetimeedit.cpp index 2cda19f9a8..57bd9074c0 100644 --- a/xfa/fxfa/parser/cxfa_datetimeedit.cpp +++ b/xfa/fxfa/parser/cxfa_datetimeedit.cpp @@ -14,25 +14,14 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Picker, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Host}, {XFA_Attribute::HScrollPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dateTimeEdit"; diff --git a/xfa/fxfa/parser/cxfa_daynames.cpp b/xfa/fxfa/parser/cxfa_daynames.cpp index c11df94e61..91ea08e15a 100644 --- a/xfa/fxfa/parser/cxfa_daynames.cpp +++ b/xfa/fxfa/parser/cxfa_daynames.cpp @@ -11,9 +11,8 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Day, 7, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Abbr, XFA_AttributeType::Boolean, XFA_XDPPACKET_LocaleSet, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Abbr, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dayNames"; diff --git a/xfa/fxfa/parser/cxfa_debug.cpp b/xfa/fxfa/parser/cxfa_debug.cpp index b4205652e1..d72bfc10a8 100644 --- a/xfa/fxfa/parser/cxfa_debug.cpp +++ b/xfa/fxfa/parser/cxfa_debug.cpp @@ -11,11 +11,9 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Uri, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"debug"; diff --git a/xfa/fxfa/parser/cxfa_decimal.cpp b/xfa/fxfa/parser/cxfa_decimal.cpp index 38878073ec..6231e490dd 100644 --- a/xfa/fxfa/parser/cxfa_decimal.cpp +++ b/xfa/fxfa/parser/cxfa_decimal.cpp @@ -9,28 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::FracDigits, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)2}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::LeadDigits, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)-1}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::FracDigits, XFA_AttributeType::Integer, (void*)2}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::LeadDigits, XFA_AttributeType::Integer, (void*)-1}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"decimal"; diff --git a/xfa/fxfa/parser/cxfa_defaulttypeface.cpp b/xfa/fxfa/parser/cxfa_defaulttypeface.cpp index df312f198d..31afda4356 100644 --- a/xfa/fxfa/parser/cxfa_defaulttypeface.cpp +++ b/xfa/fxfa/parser/cxfa_defaulttypeface.cpp @@ -9,13 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::WritingScript, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Asterisk}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Asterisk}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"defaultTypeface"; diff --git a/xfa/fxfa/parser/cxfa_defaultui.cpp b/xfa/fxfa/parser/cxfa_defaultui.cpp index 582d395aca..b93eebc6b4 100644 --- a/xfa/fxfa/parser/cxfa_defaultui.cpp +++ b/xfa/fxfa/parser/cxfa_defaultui.cpp @@ -11,19 +11,10 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"defaultUi"; diff --git a/xfa/fxfa/parser/cxfa_delete.cpp b/xfa/fxfa/parser/cxfa_delete.cpp index df0b523071..41e619d8dd 100644 --- a/xfa/fxfa/parser/cxfa_delete.cpp +++ b/xfa/fxfa/parser/cxfa_delete.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"delete"; diff --git a/xfa/fxfa/parser/cxfa_desc.cpp b/xfa/fxfa/parser/cxfa_desc.cpp index 2e6b6e2c44..e1321f8f8a 100644 --- a/xfa/fxfa/parser/cxfa_desc.cpp +++ b/xfa/fxfa/parser/cxfa_desc.cpp @@ -16,19 +16,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Date, 1, 0}, {XFA_Element::Float, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"desc"; diff --git a/xfa/fxfa/parser/cxfa_destination.cpp b/xfa/fxfa/parser/cxfa_destination.cpp index 9badfaba7a..452cd6450e 100644 --- a/xfa/fxfa/parser/cxfa_destination.cpp +++ b/xfa/fxfa/parser/cxfa_destination.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"destination"; diff --git a/xfa/fxfa/parser/cxfa_digestmethod.cpp b/xfa/fxfa/parser/cxfa_digestmethod.cpp index 485d384b57..3190e86c0e 100644 --- a/xfa/fxfa/parser/cxfa_digestmethod.cpp +++ b/xfa/fxfa/parser/cxfa_digestmethod.cpp @@ -9,19 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"digestMethod"; diff --git a/xfa/fxfa/parser/cxfa_digestmethods.cpp b/xfa/fxfa/parser/cxfa_digestmethods.cpp index 01b999bd0d..66109a6955 100644 --- a/xfa/fxfa/parser/cxfa_digestmethods.cpp +++ b/xfa/fxfa/parser/cxfa_digestmethods.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"digestMethods"; diff --git a/xfa/fxfa/parser/cxfa_documentassembly.cpp b/xfa/fxfa/parser/cxfa_documentassembly.cpp index 971bf7cb9a..5ddc90f01a 100644 --- a/xfa/fxfa/parser/cxfa_documentassembly.cpp +++ b/xfa/fxfa/parser/cxfa_documentassembly.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"documentAssembly"; diff --git a/xfa/fxfa/parser/cxfa_draw.cpp b/xfa/fxfa/parser/cxfa_draw.cpp index 6d2eea15f5..7d87d44010 100644 --- a/xfa/fxfa/parser/cxfa_draw.cpp +++ b/xfa/fxfa/parser/cxfa_draw.cpp @@ -17,61 +17,31 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Value, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::H, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::W, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::H, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::W, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rotate, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rotate, XFA_AttributeType::Integer, (void*)0}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, {XFA_Attribute::VAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, - {XFA_Attribute::MaxH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MaxW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Locale, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + (void*)XFA_ATTRIBUTEENUM_Top}, + {XFA_Attribute::MaxH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MaxW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Locale, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::AnchorType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_TopLeft}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"draw"; diff --git a/xfa/fxfa/parser/cxfa_driver.cpp b/xfa/fxfa/parser/cxfa_driver.cpp index 678c987c30..77d23c9980 100644 --- a/xfa/fxfa/parser/cxfa_driver.cpp +++ b/xfa/fxfa/parser/cxfa_driver.cpp @@ -12,16 +12,10 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::FontInfo, 1, 0}, {XFA_Element::Xdc, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"driver"; diff --git a/xfa/fxfa/parser/cxfa_dsigdata.cpp b/xfa/fxfa/parser/cxfa_dsigdata.cpp index f5e3237ad8..f1412aa19c 100644 --- a/xfa/fxfa/parser/cxfa_dsigdata.cpp +++ b/xfa/fxfa/parser/cxfa_dsigdata.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dSigData"; diff --git a/xfa/fxfa/parser/cxfa_duplexoption.cpp b/xfa/fxfa/parser/cxfa_duplexoption.cpp index 68d4b9131e..a99a2e8076 100644 --- a/xfa/fxfa/parser/cxfa_duplexoption.cpp +++ b/xfa/fxfa/parser/cxfa_duplexoption.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"duplexOption"; diff --git a/xfa/fxfa/parser/cxfa_dynamicrender.cpp b/xfa/fxfa/parser/cxfa_dynamicrender.cpp index 4fac7acc7f..901937d83d 100644 --- a/xfa/fxfa/parser/cxfa_dynamicrender.cpp +++ b/xfa/fxfa/parser/cxfa_dynamicrender.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"dynamicRender"; diff --git a/xfa/fxfa/parser/cxfa_edge.cpp b/xfa/fxfa/parser/cxfa_edge.cpp index fb580d6e1a..114063c72a 100644 --- a/xfa/fxfa/parser/cxfa_edge.cpp +++ b/xfa/fxfa/parser/cxfa_edge.cpp @@ -12,30 +12,17 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Cap, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Square}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Stroke, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Solid}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Thickness, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0.5pt"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Thickness, XFA_AttributeType::Measure, (void*)L"0.5pt"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"edge"; diff --git a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp index 0a37e8e072..79d3cb3e79 100644 --- a/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_effectiveinputpolicy.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"effectiveInputPolicy"; diff --git a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp index 1979889874..c726ef9af7 100644 --- a/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_effectiveoutputpolicy.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"effectiveOutputPolicy"; diff --git a/xfa/fxfa/parser/cxfa_embed.cpp b/xfa/fxfa/parser/cxfa_embed.cpp index ab153ee1ed..2e7423bd4a 100644 --- a/xfa/fxfa/parser/cxfa_embed.cpp +++ b/xfa/fxfa/parser/cxfa_embed.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"embed"; diff --git a/xfa/fxfa/parser/cxfa_encoding.cpp b/xfa/fxfa/parser/cxfa_encoding.cpp index 36896066c4..0752df7a5a 100644 --- a/xfa/fxfa/parser/cxfa_encoding.cpp +++ b/xfa/fxfa/parser/cxfa_encoding.cpp @@ -9,19 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encoding"; diff --git a/xfa/fxfa/parser/cxfa_encodings.cpp b/xfa/fxfa/parser/cxfa_encodings.cpp index 449b515101..45f4e7a83f 100644 --- a/xfa/fxfa/parser/cxfa_encodings.cpp +++ b/xfa/fxfa/parser/cxfa_encodings.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encodings"; diff --git a/xfa/fxfa/parser/cxfa_encrypt.cpp b/xfa/fxfa/parser/cxfa_encrypt.cpp index 14faf5110e..ea28df9bb9 100644 --- a/xfa/fxfa/parser/cxfa_encrypt.cpp +++ b/xfa/fxfa/parser/cxfa_encrypt.cpp @@ -12,23 +12,12 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Certificate, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encrypt"; diff --git a/xfa/fxfa/parser/cxfa_encryption.cpp b/xfa/fxfa/parser/cxfa_encryption.cpp index 74acb53de2..fcba1c2668 100644 --- a/xfa/fxfa/parser/cxfa_encryption.cpp +++ b/xfa/fxfa/parser/cxfa_encryption.cpp @@ -14,11 +14,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Permissions, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encryption"; diff --git a/xfa/fxfa/parser/cxfa_encryptionlevel.cpp b/xfa/fxfa/parser/cxfa_encryptionlevel.cpp index f3b0a66e88..7499be7df9 100644 --- a/xfa/fxfa/parser/cxfa_encryptionlevel.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionlevel.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encryptionLevel"; diff --git a/xfa/fxfa/parser/cxfa_encryptionmethod.cpp b/xfa/fxfa/parser/cxfa_encryptionmethod.cpp index 1db3fcb887..dba18662cf 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethod.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionmethod.cpp @@ -9,19 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encryptionMethod"; diff --git a/xfa/fxfa/parser/cxfa_encryptionmethods.cpp b/xfa/fxfa/parser/cxfa_encryptionmethods.cpp index 93d2663499..b4b3537196 100644 --- a/xfa/fxfa/parser/cxfa_encryptionmethods.cpp +++ b/xfa/fxfa/parser/cxfa_encryptionmethods.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"encryptionMethods"; diff --git a/xfa/fxfa/parser/cxfa_enforce.cpp b/xfa/fxfa/parser/cxfa_enforce.cpp index 3abee3e73f..d50d992e07 100644 --- a/xfa/fxfa/parser/cxfa_enforce.cpp +++ b/xfa/fxfa/parser/cxfa_enforce.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"enforce"; diff --git a/xfa/fxfa/parser/cxfa_equate.cpp b/xfa/fxfa/parser/cxfa_equate.cpp index 29a6794bbc..02fa339f75 100644 --- a/xfa/fxfa/parser/cxfa_equate.cpp +++ b/xfa/fxfa/parser/cxfa_equate.cpp @@ -9,17 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::To, XFA_AttributeType::CData, XFA_XDPPACKET_Config, - nullptr}, - {XFA_Attribute::Force, XFA_AttributeType::Boolean, XFA_XDPPACKET_Config, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::From, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::To, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Force, XFA_AttributeType::Boolean, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::From, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"equate"; diff --git a/xfa/fxfa/parser/cxfa_equaterange.cpp b/xfa/fxfa/parser/cxfa_equaterange.cpp index f5ee3fbfe7..f3193c8c0a 100644 --- a/xfa/fxfa/parser/cxfa_equaterange.cpp +++ b/xfa/fxfa/parser/cxfa_equaterange.cpp @@ -9,17 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::To, XFA_AttributeType::CData, XFA_XDPPACKET_Config, - nullptr}, - {XFA_Attribute::UnicodeRange, XFA_AttributeType::CData, - XFA_XDPPACKET_Config, nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::From, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::To, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::UnicodeRange, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::From, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"equateRange"; diff --git a/xfa/fxfa/parser/cxfa_event.cpp b/xfa/fxfa/parser/cxfa_event.cpp index d63bac0640..0e3e71bd20 100644 --- a/xfa/fxfa/parser/cxfa_event.cpp +++ b/xfa/fxfa/parser/cxfa_event.cpp @@ -16,34 +16,16 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Submit, 1, XFA_PROPERTYFLAG_OneOf}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Listen, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_RefOnly}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Activity, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Click}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"event"; diff --git a/xfa/fxfa/parser/cxfa_exclgroup.cpp b/xfa/fxfa/parser/cxfa_exclgroup.cpp index ad890dd170..b8255c501e 100644 --- a/xfa/fxfa/parser/cxfa_exclgroup.cpp +++ b/xfa/fxfa/parser/cxfa_exclgroup.cpp @@ -16,65 +16,34 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Desc, 1, 0}, {XFA_Element::Calculate, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::H, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::W, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::H, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::W, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Access, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Open}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, {XFA_Attribute::VAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, - {XFA_Attribute::MaxH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MaxW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, + (void*)XFA_ATTRIBUTEENUM_Top}, + {XFA_Attribute::MaxH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MaxW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinW, XFA_AttributeType::Measure, (void*)L"0in"}, {XFA_Attribute::Layout, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Position}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::AnchorType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_TopLeft}, - {XFA_Attribute::AccessKey, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::AccessKey, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"exclGroup"; diff --git a/xfa/fxfa/parser/cxfa_exclude.cpp b/xfa/fxfa/parser/cxfa_exclude.cpp index 5b86c8b51d..633914adcf 100644 --- a/xfa/fxfa/parser/cxfa_exclude.cpp +++ b/xfa/fxfa/parser/cxfa_exclude.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"exclude"; diff --git a/xfa/fxfa/parser/cxfa_excludens.cpp b/xfa/fxfa/parser/cxfa_excludens.cpp index 89c5e2911b..7a400e6480 100644 --- a/xfa/fxfa/parser/cxfa_excludens.cpp +++ b/xfa/fxfa/parser/cxfa_excludens.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"excludeNS"; diff --git a/xfa/fxfa/parser/cxfa_exdata.cpp b/xfa/fxfa/parser/cxfa_exdata.cpp index bbdb07c1da..9c3102f285 100644 --- a/xfa/fxfa/parser/cxfa_exdata.cpp +++ b/xfa/fxfa/parser/cxfa_exdata.cpp @@ -9,37 +9,17 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rid, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ContentType, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rid, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ContentType, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TransferEncoding, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::MaxLength, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)-1}, - {XFA_Attribute::Href, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::MaxLength, XFA_AttributeType::Integer, (void*)-1}, + {XFA_Attribute::Href, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"exData"; diff --git a/xfa/fxfa/parser/cxfa_execute.cpp b/xfa/fxfa/parser/cxfa_execute.cpp index 75998e7b78..bc570c8152 100644 --- a/xfa/fxfa/parser/cxfa_execute.cpp +++ b/xfa/fxfa/parser/cxfa_execute.cpp @@ -9,27 +9,15 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Connection, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Connection, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::RunAt, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Client}, {XFA_Attribute::ExecuteType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Import}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"execute"; diff --git a/xfa/fxfa/parser/cxfa_exobject.cpp b/xfa/fxfa/parser/cxfa_exobject.cpp index b20c67eb58..3e8b590a99 100644 --- a/xfa/fxfa/parser/cxfa_exobject.cpp +++ b/xfa/fxfa/parser/cxfa_exobject.cpp @@ -11,32 +11,15 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::CodeType, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Archive, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::CodeBase, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ClassId, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::CodeType, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Archive, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::CodeBase, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ClassId, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"exObject"; diff --git a/xfa/fxfa/parser/cxfa_extras.cpp b/xfa/fxfa/parser/cxfa_extras.cpp index 5a378131bc..5684dde79f 100644 --- a/xfa/fxfa/parser/cxfa_extras.cpp +++ b/xfa/fxfa/parser/cxfa_extras.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"extras"; diff --git a/xfa/fxfa/parser/cxfa_field.cpp b/xfa/fxfa/parser/cxfa_field.cpp index d928b9a3bb..95fdcb081e 100644 --- a/xfa/fxfa/parser/cxfa_field.cpp +++ b/xfa/fxfa/parser/cxfa_field.cpp @@ -19,66 +19,34 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Calculate, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Items, 2, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::H, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::W, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::H, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::W, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Access, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Open}, - {XFA_Attribute::Rotate, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + {XFA_Attribute::Rotate, XFA_AttributeType::Integer, (void*)0}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, {XFA_Attribute::VAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, - {XFA_Attribute::MaxH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MaxW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Locale, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + (void*)XFA_ATTRIBUTEENUM_Top}, + {XFA_Attribute::MaxH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MaxW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Locale, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::AnchorType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_TopLeft}, - {XFA_Attribute::AccessKey, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::AccessKey, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"field"; diff --git a/xfa/fxfa/parser/cxfa_fill.cpp b/xfa/fxfa/parser/cxfa_fill.cpp index 458a1a14c0..4b045cef20 100644 --- a/xfa/fxfa/parser/cxfa_fill.cpp +++ b/xfa/fxfa/parser/cxfa_fill.cpp @@ -19,22 +19,12 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Radial, 1, XFA_PROPERTYFLAG_OneOf}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"fill"; diff --git a/xfa/fxfa/parser/cxfa_filter.cpp b/xfa/fxfa/parser/cxfa_filter.cpp index b045d75413..cf45278cd4 100644 --- a/xfa/fxfa/parser/cxfa_filter.cpp +++ b/xfa/fxfa/parser/cxfa_filter.cpp @@ -15,28 +15,13 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Reasons, 1, 0}, {XFA_Element::AppearanceFilter, 1, 0}, {XFA_Element::LockDocument, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Version, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::AddRevocationInfo, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Version, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AddRevocationInfo, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"filter"; diff --git a/xfa/fxfa/parser/cxfa_fliplabel.cpp b/xfa/fxfa/parser/cxfa_fliplabel.cpp index 54a303096c..f95757d57c 100644 --- a/xfa/fxfa/parser/cxfa_fliplabel.cpp +++ b/xfa/fxfa/parser/cxfa_fliplabel.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"flipLabel"; diff --git a/xfa/fxfa/parser/cxfa_float.cpp b/xfa/fxfa/parser/cxfa_float.cpp index 6e7f16136f..d0e4a1b5ad 100644 --- a/xfa/fxfa/parser/cxfa_float.cpp +++ b/xfa/fxfa/parser/cxfa_float.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"float"; diff --git a/xfa/fxfa/parser/cxfa_font.cpp b/xfa/fxfa/parser/cxfa_font.cpp index f6033461f2..06a869a628 100644 --- a/xfa/fxfa/parser/cxfa_font.cpp +++ b/xfa/fxfa/parser/cxfa_font.cpp @@ -12,57 +12,36 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Fill, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::LineThrough, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Typeface, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"Courier"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::LineThrough, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Typeface, XFA_AttributeType::CData, (void*)L"Courier"}, {XFA_Attribute::FontHorizontalScale, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + (void*)L"100%"}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::KerningMode, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Underline, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::BaselineShift, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, + {XFA_Attribute::Underline, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::BaselineShift, XFA_AttributeType::Measure, (void*)L"0in"}, {XFA_Attribute::OverlinePeriod, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, - {XFA_Attribute::LetterSpacing, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + (void*)XFA_ATTRIBUTEENUM_All}, + {XFA_Attribute::LetterSpacing, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::LineThroughPeriod, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, + (void*)XFA_ATTRIBUTEENUM_All}, {XFA_Attribute::FontVerticalScale, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"100%"}, - {XFA_Attribute::PsName, XFA_AttributeType::CData, XFA_XDPPACKET_Config, - nullptr}, - {XFA_Attribute::Size, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"10pt"}, + (void*)L"100%"}, + {XFA_Attribute::PsName, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Size, XFA_AttributeType::Measure, (void*)L"10pt"}, {XFA_Attribute::Posture, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Normal}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Weight, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Normal}, {XFA_Attribute::UnderlinePeriod, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_All}, - {XFA_Attribute::Overline, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, + (void*)XFA_ATTRIBUTEENUM_All}, + {XFA_Attribute::Overline, XFA_AttributeType::Integer, (void*)0}, {XFA_Attribute::GenericFamily, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config, (void*)XFA_ATTRIBUTEENUM_Serif}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Serif}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"font"; diff --git a/xfa/fxfa/parser/cxfa_fontinfo.cpp b/xfa/fxfa/parser/cxfa_fontinfo.cpp index fb88b24cda..4ac246fe8c 100644 --- a/xfa/fxfa/parser/cxfa_fontinfo.cpp +++ b/xfa/fxfa/parser/cxfa_fontinfo.cpp @@ -14,11 +14,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Embed, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"fontInfo"; diff --git a/xfa/fxfa/parser/cxfa_form.cpp b/xfa/fxfa/parser/cxfa_form.cpp index e7d75e0161..b60dca634b 100644 --- a/xfa/fxfa/parser/cxfa_form.cpp +++ b/xfa/fxfa/parser/cxfa_form.cpp @@ -9,10 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Checksum, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form | XFA_XDPPACKET_Form, - (void*)nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Checksum, XFA_AttributeType::CData, (void*)nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"form"; diff --git a/xfa/fxfa/parser/cxfa_format.cpp b/xfa/fxfa/parser/cxfa_format.cpp index 2cc8e16cae..4546cf7c67 100644 --- a/xfa/fxfa/parser/cxfa_format.cpp +++ b/xfa/fxfa/parser/cxfa_format.cpp @@ -12,19 +12,10 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Picture, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"format"; diff --git a/xfa/fxfa/parser/cxfa_formfieldfilling.cpp b/xfa/fxfa/parser/cxfa_formfieldfilling.cpp index 3d3f4e79fc..500cf11b5b 100644 --- a/xfa/fxfa/parser/cxfa_formfieldfilling.cpp +++ b/xfa/fxfa/parser/cxfa_formfieldfilling.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"formFieldFilling"; diff --git a/xfa/fxfa/parser/cxfa_groupparent.cpp b/xfa/fxfa/parser/cxfa_groupparent.cpp index 2c2bc6bf8f..1ae6cf7296 100644 --- a/xfa/fxfa/parser/cxfa_groupparent.cpp +++ b/xfa/fxfa/parser/cxfa_groupparent.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"groupParent"; diff --git a/xfa/fxfa/parser/cxfa_handler.cpp b/xfa/fxfa/parser/cxfa_handler.cpp index a51ae2a867..6750b8be6c 100644 --- a/xfa/fxfa/parser/cxfa_handler.cpp +++ b/xfa/fxfa/parser/cxfa_handler.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"handler"; diff --git a/xfa/fxfa/parser/cxfa_hyphenation.cpp b/xfa/fxfa/parser/cxfa_hyphenation.cpp index 543a6c91f2..1e7c8822b2 100644 --- a/xfa/fxfa/parser/cxfa_hyphenation.cpp +++ b/xfa/fxfa/parser/cxfa_hyphenation.cpp @@ -9,31 +9,16 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::WordCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)7}, - {XFA_Attribute::Hyphenate, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::ExcludeInitialCap, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::PushCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, - {XFA_Attribute::RemainCharacterCount, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)3}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ExcludeAllCaps, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::WordCharacterCount, XFA_AttributeType::Integer, (void*)7}, + {XFA_Attribute::Hyphenate, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::ExcludeInitialCap, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::PushCharacterCount, XFA_AttributeType::Integer, (void*)3}, + {XFA_Attribute::RemainCharacterCount, XFA_AttributeType::Integer, (void*)3}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ExcludeAllCaps, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"hyphenation"; diff --git a/xfa/fxfa/parser/cxfa_ifempty.cpp b/xfa/fxfa/parser/cxfa_ifempty.cpp index 0853f39ee5..046899df53 100644 --- a/xfa/fxfa/parser/cxfa_ifempty.cpp +++ b/xfa/fxfa/parser/cxfa_ifempty.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ifEmpty"; diff --git a/xfa/fxfa/parser/cxfa_image.cpp b/xfa/fxfa/parser/cxfa_image.cpp index cbadb3ceb5..0e4bf44cfa 100644 --- a/xfa/fxfa/parser/cxfa_image.cpp +++ b/xfa/fxfa/parser/cxfa_image.cpp @@ -9,35 +9,17 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ContentType, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ContentType, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TransferEncoding, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Base64}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Aspect, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Fit}, - {XFA_Attribute::Href, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Fit}, + {XFA_Attribute::Href, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"image"; diff --git a/xfa/fxfa/parser/cxfa_imageedit.cpp b/xfa/fxfa/parser/cxfa_imageedit.cpp index f1678602c1..ce5ac5d419 100644 --- a/xfa/fxfa/parser/cxfa_imageedit.cpp +++ b/xfa/fxfa/parser/cxfa_imageedit.cpp @@ -13,22 +13,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Data, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Link}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"imageEdit"; diff --git a/xfa/fxfa/parser/cxfa_includexdpcontent.cpp b/xfa/fxfa/parser/cxfa_includexdpcontent.cpp index 8799e23d00..daefdddb5f 100644 --- a/xfa/fxfa/parser/cxfa_includexdpcontent.cpp +++ b/xfa/fxfa/parser/cxfa_includexdpcontent.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"includeXDPContent"; diff --git a/xfa/fxfa/parser/cxfa_incrementalload.cpp b/xfa/fxfa/parser/cxfa_incrementalload.cpp index b49b79dbba..09be8aa66d 100644 --- a/xfa/fxfa/parser/cxfa_incrementalload.cpp +++ b/xfa/fxfa/parser/cxfa_incrementalload.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"incrementalLoad"; diff --git a/xfa/fxfa/parser/cxfa_incrementalmerge.cpp b/xfa/fxfa/parser/cxfa_incrementalmerge.cpp index 28bf30f42a..7fa45c5edb 100644 --- a/xfa/fxfa/parser/cxfa_incrementalmerge.cpp +++ b/xfa/fxfa/parser/cxfa_incrementalmerge.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"incrementalMerge"; diff --git a/xfa/fxfa/parser/cxfa_insert.cpp b/xfa/fxfa/parser/cxfa_insert.cpp index 5eec30b708..cb971bcf88 100644 --- a/xfa/fxfa/parser/cxfa_insert.cpp +++ b/xfa/fxfa/parser/cxfa_insert.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"insert"; diff --git a/xfa/fxfa/parser/cxfa_instancemanager.cpp b/xfa/fxfa/parser/cxfa_instancemanager.cpp index 1386bb35e2..89081ae393 100644 --- a/xfa/fxfa/parser/cxfa_instancemanager.cpp +++ b/xfa/fxfa/parser/cxfa_instancemanager.cpp @@ -11,12 +11,8 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Occur, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"instanceManager"; diff --git a/xfa/fxfa/parser/cxfa_integer.cpp b/xfa/fxfa/parser/cxfa_integer.cpp index e2d57f689c..0b465533cf 100644 --- a/xfa/fxfa/parser/cxfa_integer.cpp +++ b/xfa/fxfa/parser/cxfa_integer.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"integer"; diff --git a/xfa/fxfa/parser/cxfa_interactive.cpp b/xfa/fxfa/parser/cxfa_interactive.cpp index 22a7c361a8..f01a7ad6aa 100644 --- a/xfa/fxfa/parser/cxfa_interactive.cpp +++ b/xfa/fxfa/parser/cxfa_interactive.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"interactive"; diff --git a/xfa/fxfa/parser/cxfa_issuers.cpp b/xfa/fxfa/parser/cxfa_issuers.cpp index e69ee15cbd..e07eb05fc3 100644 --- a/xfa/fxfa/parser/cxfa_issuers.cpp +++ b/xfa/fxfa/parser/cxfa_issuers.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"issuers"; diff --git a/xfa/fxfa/parser/cxfa_items.cpp b/xfa/fxfa/parser/cxfa_items.cpp index 801e2208c4..6a077037a1 100644 --- a/xfa/fxfa/parser/cxfa_items.cpp +++ b/xfa/fxfa/parser/cxfa_items.cpp @@ -9,33 +9,15 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, - {XFA_Attribute::Save, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Save, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"items"; diff --git a/xfa/fxfa/parser/cxfa_jog.cpp b/xfa/fxfa/parser/cxfa_jog.cpp index 19db20a987..1c8a883d99 100644 --- a/xfa/fxfa/parser/cxfa_jog.cpp +++ b/xfa/fxfa/parser/cxfa_jog.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"jog"; diff --git a/xfa/fxfa/parser/cxfa_keep.cpp b/xfa/fxfa/parser/cxfa_keep.cpp index 049a71faa1..51fb946e3e 100644 --- a/xfa/fxfa/parser/cxfa_keep.cpp +++ b/xfa/fxfa/parser/cxfa_keep.cpp @@ -11,28 +11,16 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Next, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Previous, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Intact, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_None}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"keep"; diff --git a/xfa/fxfa/parser/cxfa_keyusage.cpp b/xfa/fxfa/parser/cxfa_keyusage.cpp index 40988517f5..c24435e88a 100644 --- a/xfa/fxfa/parser/cxfa_keyusage.cpp +++ b/xfa/fxfa/parser/cxfa_keyusage.cpp @@ -9,40 +9,21 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::NonRepudiation, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::EncipherOnly, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::NonRepudiation, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::EncipherOnly, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::DigitalSignature, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::CrlSign, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::KeyAgreement, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::KeyEncipherment, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataEncipherment, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::KeyCertSign, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::DecipherOnly, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::DigitalSignature, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::CrlSign, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::KeyAgreement, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::KeyEncipherment, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataEncipherment, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::KeyCertSign, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DecipherOnly, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"keyUsage"; diff --git a/xfa/fxfa/parser/cxfa_labelprinter.cpp b/xfa/fxfa/parser/cxfa_labelprinter.cpp index a1a38bdd7d..55ac1ffec7 100644 --- a/xfa/fxfa/parser/cxfa_labelprinter.cpp +++ b/xfa/fxfa/parser/cxfa_labelprinter.cpp @@ -16,15 +16,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Zpl}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"labelPrinter"; diff --git a/xfa/fxfa/parser/cxfa_layout.cpp b/xfa/fxfa/parser/cxfa_layout.cpp index 66ea2990c5..3625061b65 100644 --- a/xfa/fxfa/parser/cxfa_layout.cpp +++ b/xfa/fxfa/parser/cxfa_layout.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"layout"; diff --git a/xfa/fxfa/parser/cxfa_level.cpp b/xfa/fxfa/parser/cxfa_level.cpp index bcfeb60de3..98a52f6624 100644 --- a/xfa/fxfa/parser/cxfa_level.cpp +++ b/xfa/fxfa/parser/cxfa_level.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"level"; diff --git a/xfa/fxfa/parser/cxfa_line.cpp b/xfa/fxfa/parser/cxfa_line.cpp index c18de5c96d..85e41ed36f 100644 --- a/xfa/fxfa/parser/cxfa_line.cpp +++ b/xfa/fxfa/parser/cxfa_line.cpp @@ -11,25 +11,14 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Edge, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Slope, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Backslash}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Hand, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Even}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"line"; diff --git a/xfa/fxfa/parser/cxfa_linear.cpp b/xfa/fxfa/parser/cxfa_linear.cpp index 999f85a8c4..f4d5ba908a 100644 --- a/xfa/fxfa/parser/cxfa_linear.cpp +++ b/xfa/fxfa/parser/cxfa_linear.cpp @@ -12,22 +12,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ToRight}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"linear"; diff --git a/xfa/fxfa/parser/cxfa_linearized.cpp b/xfa/fxfa/parser/cxfa_linearized.cpp index b63a91f83a..507ed29588 100644 --- a/xfa/fxfa/parser/cxfa_linearized.cpp +++ b/xfa/fxfa/parser/cxfa_linearized.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"linearized"; diff --git a/xfa/fxfa/parser/cxfa_locale.cpp b/xfa/fxfa/parser/cxfa_locale.cpp index d20c0d0ed8..a60fba2a91 100644 --- a/xfa/fxfa/parser/cxfa_locale.cpp +++ b/xfa/fxfa/parser/cxfa_locale.cpp @@ -15,16 +15,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::NumberSymbols, 1, 0}, {XFA_Element::TimePatterns, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"locale"; diff --git a/xfa/fxfa/parser/cxfa_localeset.cpp b/xfa/fxfa/parser/cxfa_localeset.cpp index e499eea945..86c2d21cf1 100644 --- a/xfa/fxfa/parser/cxfa_localeset.cpp +++ b/xfa/fxfa/parser/cxfa_localeset.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"localeSet"; diff --git a/xfa/fxfa/parser/cxfa_lockdocument.cpp b/xfa/fxfa/parser/cxfa_lockdocument.cpp index 20f0cd4027..ea015e56d4 100644 --- a/xfa/fxfa/parser/cxfa_lockdocument.cpp +++ b/xfa/fxfa/parser/cxfa_lockdocument.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"lockDocument"; diff --git a/xfa/fxfa/parser/cxfa_log.cpp b/xfa/fxfa/parser/cxfa_log.cpp index 7193d0d9a4..79aac1a3e3 100644 --- a/xfa/fxfa/parser/cxfa_log.cpp +++ b/xfa/fxfa/parser/cxfa_log.cpp @@ -14,11 +14,9 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::To, 1, 0}, {XFA_Element::Threshold, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"log"; diff --git a/xfa/fxfa/parser/cxfa_manifest.cpp b/xfa/fxfa/parser/cxfa_manifest.cpp index 86f8cec983..0d278a24af 100644 --- a/xfa/fxfa/parser/cxfa_manifest.cpp +++ b/xfa/fxfa/parser/cxfa_manifest.cpp @@ -11,27 +11,13 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Action, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Include}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"manifest"; diff --git a/xfa/fxfa/parser/cxfa_map.cpp b/xfa/fxfa/parser/cxfa_map.cpp index 8c26bfcd97..6fd384ad86 100644 --- a/xfa/fxfa/parser/cxfa_map.cpp +++ b/xfa/fxfa/parser/cxfa_map.cpp @@ -9,32 +9,15 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Bind, XFA_AttributeType::CData, XFA_XDPPACKET_SourceSet, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::From, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Bind, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::From, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"map"; diff --git a/xfa/fxfa/parser/cxfa_margin.cpp b/xfa/fxfa/parser/cxfa_margin.cpp index 80648065a4..367d6ee125 100644 --- a/xfa/fxfa/parser/cxfa_margin.cpp +++ b/xfa/fxfa/parser/cxfa_margin.cpp @@ -11,27 +11,14 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::LeftInset, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::BottomInset, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::TopInset, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::RightInset, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::LeftInset, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::BottomInset, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::TopInset, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::RightInset, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"margin"; diff --git a/xfa/fxfa/parser/cxfa_mdp.cpp b/xfa/fxfa/parser/cxfa_mdp.cpp index b9e5c64f5e..655b36a162 100644 --- a/xfa/fxfa/parser/cxfa_mdp.cpp +++ b/xfa/fxfa/parser/cxfa_mdp.cpp @@ -9,24 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::SignatureType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Filter}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Permissions, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)2}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Permissions, XFA_AttributeType::Integer, (void*)2}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"mdp"; diff --git a/xfa/fxfa/parser/cxfa_medium.cpp b/xfa/fxfa/parser/cxfa_medium.cpp index a033e41d74..db0c492440 100644 --- a/xfa/fxfa/parser/cxfa_medium.cpp +++ b/xfa/fxfa/parser/cxfa_medium.cpp @@ -9,36 +9,20 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::TrayOut, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Orientation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Portrait}, - {XFA_Attribute::ImagingBBox, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"none"}, - {XFA_Attribute::Short, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, + {XFA_Attribute::ImagingBBox, XFA_AttributeType::CData, (void*)L"none"}, + {XFA_Attribute::Short, XFA_AttributeType::Measure, (void*)L"0in"}, {XFA_Attribute::TrayIn, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Stock, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Long, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Stock, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Long, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"medium"; diff --git a/xfa/fxfa/parser/cxfa_mediuminfo.cpp b/xfa/fxfa/parser/cxfa_mediuminfo.cpp index 26f840f8fe..d24f889ecf 100644 --- a/xfa/fxfa/parser/cxfa_mediuminfo.cpp +++ b/xfa/fxfa/parser/cxfa_mediuminfo.cpp @@ -11,11 +11,9 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Map, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"mediumInfo"; diff --git a/xfa/fxfa/parser/cxfa_message.cpp b/xfa/fxfa/parser/cxfa_message.cpp index 512ebb1c11..d68f472fdb 100644 --- a/xfa/fxfa/parser/cxfa_message.cpp +++ b/xfa/fxfa/parser/cxfa_message.cpp @@ -12,23 +12,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::MsgId, 1, 0}, {XFA_Element::Severity, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"message"; diff --git a/xfa/fxfa/parser/cxfa_messaging.cpp b/xfa/fxfa/parser/cxfa_messaging.cpp index b0b578707f..a89e44c4a5 100644 --- a/xfa/fxfa/parser/cxfa_messaging.cpp +++ b/xfa/fxfa/parser/cxfa_messaging.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"messaging"; diff --git a/xfa/fxfa/parser/cxfa_mode.cpp b/xfa/fxfa/parser/cxfa_mode.cpp index 32fa3f791d..46ddbb28e7 100644 --- a/xfa/fxfa/parser/cxfa_mode.cpp +++ b/xfa/fxfa/parser/cxfa_mode.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"mode"; diff --git a/xfa/fxfa/parser/cxfa_modifyannots.cpp b/xfa/fxfa/parser/cxfa_modifyannots.cpp index 1083ed225e..3901042106 100644 --- a/xfa/fxfa/parser/cxfa_modifyannots.cpp +++ b/xfa/fxfa/parser/cxfa_modifyannots.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"modifyAnnots"; diff --git a/xfa/fxfa/parser/cxfa_monthnames.cpp b/xfa/fxfa/parser/cxfa_monthnames.cpp index 427418848a..96f22df524 100644 --- a/xfa/fxfa/parser/cxfa_monthnames.cpp +++ b/xfa/fxfa/parser/cxfa_monthnames.cpp @@ -11,9 +11,8 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Month, 12, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Abbr, XFA_AttributeType::Boolean, XFA_XDPPACKET_LocaleSet, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Abbr, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"monthNames"; diff --git a/xfa/fxfa/parser/cxfa_msgid.cpp b/xfa/fxfa/parser/cxfa_msgid.cpp index 0af55a6c1b..4be43f1480 100644 --- a/xfa/fxfa/parser/cxfa_msgid.cpp +++ b/xfa/fxfa/parser/cxfa_msgid.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"msgId"; diff --git a/xfa/fxfa/parser/cxfa_nameattr.cpp b/xfa/fxfa/parser/cxfa_nameattr.cpp index 6756eaf3ff..4217c13d21 100644 --- a/xfa/fxfa/parser/cxfa_nameattr.cpp +++ b/xfa/fxfa/parser/cxfa_nameattr.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"nameAttr"; diff --git a/xfa/fxfa/parser/cxfa_neverembed.cpp b/xfa/fxfa/parser/cxfa_neverembed.cpp index d246e32ffc..10f4dd6739 100644 --- a/xfa/fxfa/parser/cxfa_neverembed.cpp +++ b/xfa/fxfa/parser/cxfa_neverembed.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"neverEmbed"; diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 4eff4b0748..4d9e9966cb 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1354,8 +1354,6 @@ pdfium::Optional<void*> CXFA_Node::GetDefaultValue( const AttributeData* data = GetAttributeData(attr); if (!data) return {}; - if (GetPacketID() && (GetPacketID() & data->packets) == 0) - return {}; if (data->type == eType) return {data->default_value}; return {}; diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index 238bb12b06..b5217ad832 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -56,7 +56,6 @@ class CXFA_Node : public CXFA_Object { struct AttributeData { XFA_Attribute attribute; XFA_AttributeType type; - uint32_t packets; void* default_value; }; diff --git a/xfa/fxfa/parser/cxfa_numberofcopies.cpp b/xfa/fxfa/parser/cxfa_numberofcopies.cpp index e0196539a3..5c869e474b 100644 --- a/xfa/fxfa/parser/cxfa_numberofcopies.cpp +++ b/xfa/fxfa/parser/cxfa_numberofcopies.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"numberOfCopies"; diff --git a/xfa/fxfa/parser/cxfa_numberpattern.cpp b/xfa/fxfa/parser/cxfa_numberpattern.cpp index 9896723587..558e2cd478 100644 --- a/xfa/fxfa/parser/cxfa_numberpattern.cpp +++ b/xfa/fxfa/parser/cxfa_numberpattern.cpp @@ -10,11 +10,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Numeric}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"numberPattern"; diff --git a/xfa/fxfa/parser/cxfa_numbersymbol.cpp b/xfa/fxfa/parser/cxfa_numbersymbol.cpp index 46a437f9ef..78417c29ab 100644 --- a/xfa/fxfa/parser/cxfa_numbersymbol.cpp +++ b/xfa/fxfa/parser/cxfa_numbersymbol.cpp @@ -10,11 +10,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Decimal}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"numberSymbol"; diff --git a/xfa/fxfa/parser/cxfa_numericedit.cpp b/xfa/fxfa/parser/cxfa_numericedit.cpp index 2c9f8787c9..812a45381b 100644 --- a/xfa/fxfa/parser/cxfa_numericedit.cpp +++ b/xfa/fxfa/parser/cxfa_numericedit.cpp @@ -14,22 +14,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HScrollPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"numericEdit"; diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp index 01ad10eaf7..0c50e1ffab 100644 --- a/xfa/fxfa/parser/cxfa_occur.cpp +++ b/xfa/fxfa/parser/cxfa_occur.cpp @@ -11,26 +11,13 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Max, XFA_AttributeType::Integer, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)1}, - {XFA_Attribute::Min, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Initial, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Max, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Min, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Initial, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"occur"; diff --git a/xfa/fxfa/parser/cxfa_oid.cpp b/xfa/fxfa/parser/cxfa_oid.cpp index 96bb3f962d..8b5cdb925c 100644 --- a/xfa/fxfa/parser/cxfa_oid.cpp +++ b/xfa/fxfa/parser/cxfa_oid.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"oid"; diff --git a/xfa/fxfa/parser/cxfa_oids.cpp b/xfa/fxfa/parser/cxfa_oids.cpp index 45b9d7b7c8..2a8ffbc276 100644 --- a/xfa/fxfa/parser/cxfa_oids.cpp +++ b/xfa/fxfa/parser/cxfa_oids.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"oids"; diff --git a/xfa/fxfa/parser/cxfa_openaction.cpp b/xfa/fxfa/parser/cxfa_openaction.cpp index daffa2cac4..69a4e2a496 100644 --- a/xfa/fxfa/parser/cxfa_openaction.cpp +++ b/xfa/fxfa/parser/cxfa_openaction.cpp @@ -12,11 +12,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Destination, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"openAction"; diff --git a/xfa/fxfa/parser/cxfa_operation.cpp b/xfa/fxfa/parser/cxfa_operation.cpp index 81062a32eb..03d3ee1a5b 100644 --- a/xfa/fxfa/parser/cxfa_operation.cpp +++ b/xfa/fxfa/parser/cxfa_operation.cpp @@ -9,28 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Output, XFA_AttributeType::CData, - XFA_XDPPACKET_ConnectionSet, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Input, XFA_AttributeType::CData, - XFA_XDPPACKET_ConnectionSet, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Output, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Input, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"operation"; diff --git a/xfa/fxfa/parser/cxfa_output.cpp b/xfa/fxfa/parser/cxfa_output.cpp index 38f3847b45..5a7077c03b 100644 --- a/xfa/fxfa/parser/cxfa_output.cpp +++ b/xfa/fxfa/parser/cxfa_output.cpp @@ -13,11 +13,9 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::To, 1, 0}, {XFA_Element::Type, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"output"; diff --git a/xfa/fxfa/parser/cxfa_outputbin.cpp b/xfa/fxfa/parser/cxfa_outputbin.cpp index 9be45fbe0a..f6a390ac10 100644 --- a/xfa/fxfa/parser/cxfa_outputbin.cpp +++ b/xfa/fxfa/parser/cxfa_outputbin.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"outputBin"; diff --git a/xfa/fxfa/parser/cxfa_outputxsl.cpp b/xfa/fxfa/parser/cxfa_outputxsl.cpp index c3155c10dc..dd29ad6556 100644 --- a/xfa/fxfa/parser/cxfa_outputxsl.cpp +++ b/xfa/fxfa/parser/cxfa_outputxsl.cpp @@ -11,11 +11,9 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Uri, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"outputXSL"; diff --git a/xfa/fxfa/parser/cxfa_overflow.cpp b/xfa/fxfa/parser/cxfa_overflow.cpp index 22d704e4be..e2290d8f7d 100644 --- a/xfa/fxfa/parser/cxfa_overflow.cpp +++ b/xfa/fxfa/parser/cxfa_overflow.cpp @@ -9,25 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Trailer, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Leader, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Trailer, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Leader, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"overflow"; diff --git a/xfa/fxfa/parser/cxfa_overprint.cpp b/xfa/fxfa/parser/cxfa_overprint.cpp index e7a4133ffb..deaa34a518 100644 --- a/xfa/fxfa/parser/cxfa_overprint.cpp +++ b/xfa/fxfa/parser/cxfa_overprint.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"overprint"; diff --git a/xfa/fxfa/parser/cxfa_packets.cpp b/xfa/fxfa/parser/cxfa_packets.cpp index 94de39d1ff..a893a054fd 100644 --- a/xfa/fxfa/parser/cxfa_packets.cpp +++ b/xfa/fxfa/parser/cxfa_packets.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"packets"; diff --git a/xfa/fxfa/parser/cxfa_pagearea.cpp b/xfa/fxfa/parser/cxfa_pagearea.cpp index a133b178be..2fc487c470 100644 --- a/xfa/fxfa/parser/cxfa_pagearea.cpp +++ b/xfa/fxfa/parser/cxfa_pagearea.cpp @@ -14,36 +14,20 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Medium, 1, 0}, {XFA_Element::Occur, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::PagePosition, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, + (void*)XFA_ATTRIBUTEENUM_Any}, {XFA_Attribute::OddOrEven, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::InitialNumber, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Numbered, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, + (void*)XFA_ATTRIBUTEENUM_Any}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::InitialNumber, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Numbered, XFA_AttributeType::Integer, (void*)1}, {XFA_Attribute::BlankOrNotBlank, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Any}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Any}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pageArea"; diff --git a/xfa/fxfa/parser/cxfa_pageoffset.cpp b/xfa/fxfa/parser/cxfa_pageoffset.cpp index 090c1e59b6..81ac51d161 100644 --- a/xfa/fxfa/parser/cxfa_pageoffset.cpp +++ b/xfa/fxfa/parser/cxfa_pageoffset.cpp @@ -9,17 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pageOffset"; diff --git a/xfa/fxfa/parser/cxfa_pagerange.cpp b/xfa/fxfa/parser/cxfa_pagerange.cpp index 635d19587b..48e5031b0e 100644 --- a/xfa/fxfa/parser/cxfa_pagerange.cpp +++ b/xfa/fxfa/parser/cxfa_pagerange.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pageRange"; diff --git a/xfa/fxfa/parser/cxfa_pageset.cpp b/xfa/fxfa/parser/cxfa_pageset.cpp index e76b7b5f66..764b1cce71 100644 --- a/xfa/fxfa/parser/cxfa_pageset.cpp +++ b/xfa/fxfa/parser/cxfa_pageset.cpp @@ -12,32 +12,16 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Occur, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Relation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_OrderedOccurrence}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::DuplexImposition, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_LongEdge}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pageSet"; diff --git a/xfa/fxfa/parser/cxfa_pagination.cpp b/xfa/fxfa/parser/cxfa_pagination.cpp index a2f3628b35..8f6090415a 100644 --- a/xfa/fxfa/parser/cxfa_pagination.cpp +++ b/xfa/fxfa/parser/cxfa_pagination.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pagination"; diff --git a/xfa/fxfa/parser/cxfa_paginationoverride.cpp b/xfa/fxfa/parser/cxfa_paginationoverride.cpp index 2b06a55bb7..41e742b849 100644 --- a/xfa/fxfa/parser/cxfa_paginationoverride.cpp +++ b/xfa/fxfa/parser/cxfa_paginationoverride.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"paginationOverride"; diff --git a/xfa/fxfa/parser/cxfa_para.cpp b/xfa/fxfa/parser/cxfa_para.cpp index 89b040df99..3fe413bdb7 100644 --- a/xfa/fxfa/parser/cxfa_para.cpp +++ b/xfa/fxfa/parser/cxfa_para.cpp @@ -12,48 +12,26 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Hyphenation, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::TextIndent, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Widows, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::MarginRight, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MarginLeft, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::RadixOffset, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Preserve, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::SpaceBelow, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, + {XFA_Attribute::TextIndent, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Widows, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::MarginRight, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MarginLeft, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::RadixOffset, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Preserve, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::SpaceBelow, XFA_AttributeType::Measure, (void*)L"0in"}, {XFA_Attribute::VAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, - {XFA_Attribute::TabDefault, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::TabStops, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Orphans, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::LineHeight, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0pt"}, - {XFA_Attribute::SpaceAbove, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Top}, + {XFA_Attribute::TabDefault, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::TabStops, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Orphans, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::LineHeight, XFA_AttributeType::Measure, (void*)L"0pt"}, + {XFA_Attribute::SpaceAbove, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"para"; diff --git a/xfa/fxfa/parser/cxfa_part.cpp b/xfa/fxfa/parser/cxfa_part.cpp index 8a97a52bc7..fb510c290c 100644 --- a/xfa/fxfa/parser/cxfa_part.cpp +++ b/xfa/fxfa/parser/cxfa_part.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"part"; diff --git a/xfa/fxfa/parser/cxfa_password.cpp b/xfa/fxfa/parser/cxfa_password.cpp index f54002b78b..29a25f2345 100644 --- a/xfa/fxfa/parser/cxfa_password.cpp +++ b/xfa/fxfa/parser/cxfa_password.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"password"; diff --git a/xfa/fxfa/parser/cxfa_passwordedit.cpp b/xfa/fxfa/parser/cxfa_passwordedit.cpp index 245d0184f8..50ee196b4d 100644 --- a/xfa/fxfa/parser/cxfa_passwordedit.cpp +++ b/xfa/fxfa/parser/cxfa_passwordedit.cpp @@ -13,24 +13,13 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::PasswordChar, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"*"}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::PasswordChar, XFA_AttributeType::CData, (void*)L"*"}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HScrollPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"passwordEdit"; diff --git a/xfa/fxfa/parser/cxfa_pattern.cpp b/xfa/fxfa/parser/cxfa_pattern.cpp index 9ee2c70d79..0b625868de 100644 --- a/xfa/fxfa/parser/cxfa_pattern.cpp +++ b/xfa/fxfa/parser/cxfa_pattern.cpp @@ -12,22 +12,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_CrossHatch}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pattern"; diff --git a/xfa/fxfa/parser/cxfa_pcl.cpp b/xfa/fxfa/parser/cxfa_pcl.cpp index 5ae0336362..4a723f5d9d 100644 --- a/xfa/fxfa/parser/cxfa_pcl.cpp +++ b/xfa/fxfa/parser/cxfa_pcl.cpp @@ -15,16 +15,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Staple, 1, 0}, {XFA_Element::MediumInfo, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pcl"; diff --git a/xfa/fxfa/parser/cxfa_pdf.cpp b/xfa/fxfa/parser/cxfa_pdf.cpp index 6b9419321b..0318d41f54 100644 --- a/xfa/fxfa/parser/cxfa_pdf.cpp +++ b/xfa/fxfa/parser/cxfa_pdf.cpp @@ -30,16 +30,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Tagged, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pdf"; diff --git a/xfa/fxfa/parser/cxfa_pdfa.cpp b/xfa/fxfa/parser/cxfa_pdfa.cpp index fd7be6b8f6..01f32ce948 100644 --- a/xfa/fxfa/parser/cxfa_pdfa.cpp +++ b/xfa/fxfa/parser/cxfa_pdfa.cpp @@ -15,11 +15,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Conformance, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pdfa"; diff --git a/xfa/fxfa/parser/cxfa_permissions.cpp b/xfa/fxfa/parser/cxfa_permissions.cpp index 33bb76c325..21fdead616 100644 --- a/xfa/fxfa/parser/cxfa_permissions.cpp +++ b/xfa/fxfa/parser/cxfa_permissions.cpp @@ -20,11 +20,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::DocumentAssembly, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"permissions"; diff --git a/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp b/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp index 57de8d5089..5a477d01b5 100644 --- a/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp +++ b/xfa/fxfa/parser/cxfa_picktraybypdfsize.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"pickTrayByPDFSize"; diff --git a/xfa/fxfa/parser/cxfa_picture.cpp b/xfa/fxfa/parser/cxfa_picture.cpp index 4d2260208c..1ab630757b 100644 --- a/xfa/fxfa/parser/cxfa_picture.cpp +++ b/xfa/fxfa/parser/cxfa_picture.cpp @@ -9,23 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"picture"; diff --git a/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp b/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp index 2b39226329..3ad5cfd036 100644 --- a/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp +++ b/xfa/fxfa/parser/cxfa_plaintextmetadata.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"plaintextMetadata"; diff --git a/xfa/fxfa/parser/cxfa_presence.cpp b/xfa/fxfa/parser/cxfa_presence.cpp index 6fead44918..54547b96c1 100644 --- a/xfa/fxfa/parser/cxfa_presence.cpp +++ b/xfa/fxfa/parser/cxfa_presence.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"presence"; diff --git a/xfa/fxfa/parser/cxfa_present.cpp b/xfa/fxfa/parser/cxfa_present.cpp index 97a6a83c75..2792cad8a9 100644 --- a/xfa/fxfa/parser/cxfa_present.cpp +++ b/xfa/fxfa/parser/cxfa_present.cpp @@ -25,11 +25,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::IncrementalMerge, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"present"; diff --git a/xfa/fxfa/parser/cxfa_print.cpp b/xfa/fxfa/parser/cxfa_print.cpp index 7c71b7d15b..b1bd71ac05 100644 --- a/xfa/fxfa/parser/cxfa_print.cpp +++ b/xfa/fxfa/parser/cxfa_print.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"print"; diff --git a/xfa/fxfa/parser/cxfa_printername.cpp b/xfa/fxfa/parser/cxfa_printername.cpp index 6d582194ce..31fc5f5efe 100644 --- a/xfa/fxfa/parser/cxfa_printername.cpp +++ b/xfa/fxfa/parser/cxfa_printername.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"printerName"; diff --git a/xfa/fxfa/parser/cxfa_printhighquality.cpp b/xfa/fxfa/parser/cxfa_printhighquality.cpp index 55c58e93c8..0febf5d2b0 100644 --- a/xfa/fxfa/parser/cxfa_printhighquality.cpp +++ b/xfa/fxfa/parser/cxfa_printhighquality.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"printHighQuality"; diff --git a/xfa/fxfa/parser/cxfa_printscaling.cpp b/xfa/fxfa/parser/cxfa_printscaling.cpp index 5f046c5dca..d400f64449 100644 --- a/xfa/fxfa/parser/cxfa_printscaling.cpp +++ b/xfa/fxfa/parser/cxfa_printscaling.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"printScaling"; diff --git a/xfa/fxfa/parser/cxfa_producer.cpp b/xfa/fxfa/parser/cxfa_producer.cpp index bc60a1344b..585a32cb71 100644 --- a/xfa/fxfa/parser/cxfa_producer.cpp +++ b/xfa/fxfa/parser/cxfa_producer.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"producer"; diff --git a/xfa/fxfa/parser/cxfa_ps.cpp b/xfa/fxfa/parser/cxfa_ps.cpp index 0c656fbc19..09676a909b 100644 --- a/xfa/fxfa/parser/cxfa_ps.cpp +++ b/xfa/fxfa/parser/cxfa_ps.cpp @@ -15,16 +15,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Staple, 1, 0}, {XFA_Element::MediumInfo, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ps"; diff --git a/xfa/fxfa/parser/cxfa_query.cpp b/xfa/fxfa/parser/cxfa_query.cpp index d871d2bff1..dd3427eb84 100644 --- a/xfa/fxfa/parser/cxfa_query.cpp +++ b/xfa/fxfa/parser/cxfa_query.cpp @@ -12,26 +12,13 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::RecordSet, 1, 0}, {XFA_Element::Select, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::CommandType, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_Unknown}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Unknown}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"query"; diff --git a/xfa/fxfa/parser/cxfa_radial.cpp b/xfa/fxfa/parser/cxfa_radial.cpp index 98ac05c960..3f5ac4bfdf 100644 --- a/xfa/fxfa/parser/cxfa_radial.cpp +++ b/xfa/fxfa/parser/cxfa_radial.cpp @@ -12,22 +12,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ToEdge}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"radial"; diff --git a/xfa/fxfa/parser/cxfa_range.cpp b/xfa/fxfa/parser/cxfa_range.cpp index 56d02e8e84..c72b89c489 100644 --- a/xfa/fxfa/parser/cxfa_range.cpp +++ b/xfa/fxfa/parser/cxfa_range.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"range"; diff --git a/xfa/fxfa/parser/cxfa_reason.cpp b/xfa/fxfa/parser/cxfa_reason.cpp index 533b2dd4ba..5a6f753f8f 100644 --- a/xfa/fxfa/parser/cxfa_reason.cpp +++ b/xfa/fxfa/parser/cxfa_reason.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"reason"; diff --git a/xfa/fxfa/parser/cxfa_reasons.cpp b/xfa/fxfa/parser/cxfa_reasons.cpp index f578cc16f3..afcb665dc2 100644 --- a/xfa/fxfa/parser/cxfa_reasons.cpp +++ b/xfa/fxfa/parser/cxfa_reasons.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"reasons"; diff --git a/xfa/fxfa/parser/cxfa_record.cpp b/xfa/fxfa/parser/cxfa_record.cpp index e2445d0771..aefe0c423f 100644 --- a/xfa/fxfa/parser/cxfa_record.cpp +++ b/xfa/fxfa/parser/cxfa_record.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"record"; diff --git a/xfa/fxfa/parser/cxfa_recordset.cpp b/xfa/fxfa/parser/cxfa_recordset.cpp index 22a0e85e09..4da2239a9f 100644 --- a/xfa/fxfa/parser/cxfa_recordset.cpp +++ b/xfa/fxfa/parser/cxfa_recordset.cpp @@ -9,37 +9,22 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Max, XFA_AttributeType::Integer, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)0}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::EofAction, XFA_AttributeType::Enum, XFA_XDPPACKET_SourceSet, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Max, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::EofAction, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_MoveLast}, {XFA_Attribute::CursorType, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_ForwardOnly}, - {XFA_Attribute::LockType, XFA_AttributeType::Enum, XFA_XDPPACKET_SourceSet, + (void*)XFA_ATTRIBUTEENUM_ForwardOnly}, + {XFA_Attribute::LockType, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_ReadOnly}, - {XFA_Attribute::BofAction, XFA_AttributeType::Enum, XFA_XDPPACKET_SourceSet, + {XFA_Attribute::BofAction, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_MoveFirst}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::CursorLocation, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet, (void*)XFA_ATTRIBUTEENUM_Client}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + (void*)XFA_ATTRIBUTEENUM_Client}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"recordSet"; diff --git a/xfa/fxfa/parser/cxfa_rectangle.cpp b/xfa/fxfa/parser/cxfa_rectangle.cpp index 25e4449af3..29fb41146b 100644 --- a/xfa/fxfa/parser/cxfa_rectangle.cpp +++ b/xfa/fxfa/parser/cxfa_rectangle.cpp @@ -13,22 +13,12 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Edge, 4, 0}, {XFA_Element::Fill, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Hand, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Even}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"rectangle"; diff --git a/xfa/fxfa/parser/cxfa_ref.cpp b/xfa/fxfa/parser/cxfa_ref.cpp index 138979e228..3d1e37835b 100644 --- a/xfa/fxfa/parser/cxfa_ref.cpp +++ b/xfa/fxfa/parser/cxfa_ref.cpp @@ -9,19 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ref"; diff --git a/xfa/fxfa/parser/cxfa_relevant.cpp b/xfa/fxfa/parser/cxfa_relevant.cpp index 91e219e3a0..b4fa4bb873 100644 --- a/xfa/fxfa/parser/cxfa_relevant.cpp +++ b/xfa/fxfa/parser/cxfa_relevant.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"relevant"; diff --git a/xfa/fxfa/parser/cxfa_rename.cpp b/xfa/fxfa/parser/cxfa_rename.cpp index 7c74f06622..f91ac31d3d 100644 --- a/xfa/fxfa/parser/cxfa_rename.cpp +++ b/xfa/fxfa/parser/cxfa_rename.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"rename"; diff --git a/xfa/fxfa/parser/cxfa_renderpolicy.cpp b/xfa/fxfa/parser/cxfa_renderpolicy.cpp index a974f0399e..71bbb82dce 100644 --- a/xfa/fxfa/parser/cxfa_renderpolicy.cpp +++ b/xfa/fxfa/parser/cxfa_renderpolicy.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"renderPolicy"; diff --git a/xfa/fxfa/parser/cxfa_rootelement.cpp b/xfa/fxfa/parser/cxfa_rootelement.cpp index 0ace007cf1..1332e79d0b 100644 --- a/xfa/fxfa/parser/cxfa_rootelement.cpp +++ b/xfa/fxfa/parser/cxfa_rootelement.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"rootElement"; diff --git a/xfa/fxfa/parser/cxfa_runscripts.cpp b/xfa/fxfa/parser/cxfa_runscripts.cpp index 0b90ceb771..8000eb8a11 100644 --- a/xfa/fxfa/parser/cxfa_runscripts.cpp +++ b/xfa/fxfa/parser/cxfa_runscripts.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"runScripts"; diff --git a/xfa/fxfa/parser/cxfa_script.cpp b/xfa/fxfa/parser/cxfa_script.cpp index b85ef4b1f0..c83d75bac5 100644 --- a/xfa/fxfa/parser/cxfa_script.cpp +++ b/xfa/fxfa/parser/cxfa_script.cpp @@ -14,37 +14,17 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::RunScripts, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::ContentType, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::ContentType, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::RunAt, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Client}, - {XFA_Attribute::Binding, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Binding, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"script"; diff --git a/xfa/fxfa/parser/cxfa_scriptmodel.cpp b/xfa/fxfa/parser/cxfa_scriptmodel.cpp index 0790169075..46b81fefcf 100644 --- a/xfa/fxfa/parser/cxfa_scriptmodel.cpp +++ b/xfa/fxfa/parser/cxfa_scriptmodel.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"scriptModel"; diff --git a/xfa/fxfa/parser/cxfa_select.cpp b/xfa/fxfa/parser/cxfa_select.cpp index 90c7fd221a..07f6909d60 100644 --- a/xfa/fxfa/parser/cxfa_select.cpp +++ b/xfa/fxfa/parser/cxfa_select.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"select"; diff --git a/xfa/fxfa/parser/cxfa_setproperty.cpp b/xfa/fxfa/parser/cxfa_setproperty.cpp index 6b68bfa9a1..1bbcfdbd49 100644 --- a/xfa/fxfa/parser/cxfa_setproperty.cpp +++ b/xfa/fxfa/parser/cxfa_setproperty.cpp @@ -9,15 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Connection, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Connection, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"setProperty"; diff --git a/xfa/fxfa/parser/cxfa_severity.cpp b/xfa/fxfa/parser/cxfa_severity.cpp index 8d1b83da18..23ce442f2b 100644 --- a/xfa/fxfa/parser/cxfa_severity.cpp +++ b/xfa/fxfa/parser/cxfa_severity.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"severity"; diff --git a/xfa/fxfa/parser/cxfa_sharptext.cpp b/xfa/fxfa/parser/cxfa_sharptext.cpp index 6580c7dd9d..9043d998b5 100644 --- a/xfa/fxfa/parser/cxfa_sharptext.cpp +++ b/xfa/fxfa/parser/cxfa_sharptext.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"#text"; diff --git a/xfa/fxfa/parser/cxfa_sharpxhtml.cpp b/xfa/fxfa/parser/cxfa_sharpxhtml.cpp index 21c51a4b6a..498a3892a1 100644 --- a/xfa/fxfa/parser/cxfa_sharpxhtml.cpp +++ b/xfa/fxfa/parser/cxfa_sharpxhtml.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"#xHTML"; diff --git a/xfa/fxfa/parser/cxfa_sharpxml.cpp b/xfa/fxfa/parser/cxfa_sharpxml.cpp index 3b102bef06..2636eb6aaa 100644 --- a/xfa/fxfa/parser/cxfa_sharpxml.cpp +++ b/xfa/fxfa/parser/cxfa_sharpxml.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Value, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Value, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"#xml"; diff --git a/xfa/fxfa/parser/cxfa_signature.cpp b/xfa/fxfa/parser/cxfa_signature.cpp index 03b4423f52..2640be7a8c 100644 --- a/xfa/fxfa/parser/cxfa_signature.cpp +++ b/xfa/fxfa/parser/cxfa_signature.cpp @@ -13,22 +13,12 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Border, 1, 0}, {XFA_Element::Manifest, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_PDF1_3}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"signature"; diff --git a/xfa/fxfa/parser/cxfa_signatureproperties.cpp b/xfa/fxfa/parser/cxfa_signatureproperties.cpp index 318bc89a5f..c55d858572 100644 --- a/xfa/fxfa/parser/cxfa_signatureproperties.cpp +++ b/xfa/fxfa/parser/cxfa_signatureproperties.cpp @@ -9,15 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"signatureProperties"; diff --git a/xfa/fxfa/parser/cxfa_signdata.cpp b/xfa/fxfa/parser/cxfa_signdata.cpp index 364c6c2759..dcdb2bf26e 100644 --- a/xfa/fxfa/parser/cxfa_signdata.cpp +++ b/xfa/fxfa/parser/cxfa_signdata.cpp @@ -12,28 +12,14 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Filter, 1, 0}, {XFA_Element::Manifest, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Operation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Sign}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"signData"; diff --git a/xfa/fxfa/parser/cxfa_signing.cpp b/xfa/fxfa/parser/cxfa_signing.cpp index 9ff5ab1600..87b931ecff 100644 --- a/xfa/fxfa/parser/cxfa_signing.cpp +++ b/xfa/fxfa/parser/cxfa_signing.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"signing"; diff --git a/xfa/fxfa/parser/cxfa_silentprint.cpp b/xfa/fxfa/parser/cxfa_silentprint.cpp index 6f421597c5..eef75692db 100644 --- a/xfa/fxfa/parser/cxfa_silentprint.cpp +++ b/xfa/fxfa/parser/cxfa_silentprint.cpp @@ -13,11 +13,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::PrinterName, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"silentPrint"; diff --git a/xfa/fxfa/parser/cxfa_soapaction.cpp b/xfa/fxfa/parser/cxfa_soapaction.cpp index 55284dd28b..9a2c76a9fb 100644 --- a/xfa/fxfa/parser/cxfa_soapaction.cpp +++ b/xfa/fxfa/parser/cxfa_soapaction.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"soapAction"; diff --git a/xfa/fxfa/parser/cxfa_soapaddress.cpp b/xfa/fxfa/parser/cxfa_soapaddress.cpp index d88f74513c..671460fd95 100644 --- a/xfa/fxfa/parser/cxfa_soapaddress.cpp +++ b/xfa/fxfa/parser/cxfa_soapaddress.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"soapAddress"; diff --git a/xfa/fxfa/parser/cxfa_solid.cpp b/xfa/fxfa/parser/cxfa_solid.cpp index 8395794d97..9d9d6e2a65 100644 --- a/xfa/fxfa/parser/cxfa_solid.cpp +++ b/xfa/fxfa/parser/cxfa_solid.cpp @@ -11,19 +11,10 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"solid"; diff --git a/xfa/fxfa/parser/cxfa_source.cpp b/xfa/fxfa/parser/cxfa_source.cpp index 5887948361..bbe82429eb 100644 --- a/xfa/fxfa/parser/cxfa_source.cpp +++ b/xfa/fxfa/parser/cxfa_source.cpp @@ -11,24 +11,11 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Connect, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"source"; diff --git a/xfa/fxfa/parser/cxfa_sourceset.cpp b/xfa/fxfa/parser/cxfa_sourceset.cpp index 0b61fd8b4b..4fa642ffb1 100644 --- a/xfa/fxfa/parser/cxfa_sourceset.cpp +++ b/xfa/fxfa/parser/cxfa_sourceset.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"sourceSet"; diff --git a/xfa/fxfa/parser/cxfa_speak.cpp b/xfa/fxfa/parser/cxfa_speak.cpp index 4ff0314055..48e9aaf1e6 100644 --- a/xfa/fxfa/parser/cxfa_speak.cpp +++ b/xfa/fxfa/parser/cxfa_speak.cpp @@ -9,26 +9,14 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rid, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rid, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Priority, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Custom}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Disable, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Disable, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"speak"; diff --git a/xfa/fxfa/parser/cxfa_staple.cpp b/xfa/fxfa/parser/cxfa_staple.cpp index a2cf69592a..8cf8c47d6a 100644 --- a/xfa/fxfa/parser/cxfa_staple.cpp +++ b/xfa/fxfa/parser/cxfa_staple.cpp @@ -9,13 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Mode, XFA_AttributeType::Enum, XFA_XDPPACKET_Config, + {XFA_Attribute::Mode, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_UsePrinterSetting}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"staple"; diff --git a/xfa/fxfa/parser/cxfa_startnode.cpp b/xfa/fxfa/parser/cxfa_startnode.cpp index 71d5183cf6..2c4d680f22 100644 --- a/xfa/fxfa/parser/cxfa_startnode.cpp +++ b/xfa/fxfa/parser/cxfa_startnode.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"startNode"; diff --git a/xfa/fxfa/parser/cxfa_startpage.cpp b/xfa/fxfa/parser/cxfa_startpage.cpp index 60655267a4..20e1bdca5e 100644 --- a/xfa/fxfa/parser/cxfa_startpage.cpp +++ b/xfa/fxfa/parser/cxfa_startpage.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"startPage"; diff --git a/xfa/fxfa/parser/cxfa_stipple.cpp b/xfa/fxfa/parser/cxfa_stipple.cpp index 9988a22022..b389d9b02f 100644 --- a/xfa/fxfa/parser/cxfa_stipple.cpp +++ b/xfa/fxfa/parser/cxfa_stipple.cpp @@ -12,21 +12,11 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Color, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rate, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)50}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rate, XFA_AttributeType::Integer, (void*)50}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"stipple"; diff --git a/xfa/fxfa/parser/cxfa_subform.cpp b/xfa/fxfa/parser/cxfa_subform.cpp index 1e62f17764..10d55805a4 100644 --- a/xfa/fxfa/parser/cxfa_subform.cpp +++ b/xfa/fxfa/parser/cxfa_subform.cpp @@ -19,78 +19,42 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Extras, 1, 0}, {XFA_Element::Variables, 1, 0}, {XFA_Element::Occur, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::H, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::W, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::X, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Y, XFA_AttributeType::Measure, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, - (void*)L"0in"}, - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::H, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::W, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::X, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Y, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Left}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::AllowMacro, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::ColumnWidths, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AllowMacro, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::ColumnWidths, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Access, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Open}, {XFA_Attribute::Presence, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Visible}, {XFA_Attribute::VAlign, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Top}, - {XFA_Attribute::MaxH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MaxW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinH, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, - {XFA_Attribute::MinW, XFA_AttributeType::Measure, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)L"0in"}, + (void*)XFA_ATTRIBUTEENUM_Top}, + {XFA_Attribute::MaxH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MaxW, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinH, XFA_AttributeType::Measure, (void*)L"0in"}, + {XFA_Attribute::MinW, XFA_AttributeType::Measure, (void*)L"0in"}, {XFA_Attribute::Layout, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Position}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::MergeMode, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_ConsumeData}, - {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)1}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Locale, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, + {XFA_Attribute::ColSpan, XFA_AttributeType::Integer, (void*)1}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Locale, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::AnchorType, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_TopLeft}, {XFA_Attribute::RestoreState, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Manual}, {XFA_Attribute::Scope, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Name}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"subform"; diff --git a/xfa/fxfa/parser/cxfa_subformset.cpp b/xfa/fxfa/parser/cxfa_subformset.cpp index 4d6d8aac81..56c79e8963 100644 --- a/xfa/fxfa/parser/cxfa_subformset.cpp +++ b/xfa/fxfa/parser/cxfa_subformset.cpp @@ -14,29 +14,14 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Extras, 1, 0}, {XFA_Element::Occur, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Relation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Ordered}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"subformSet"; diff --git a/xfa/fxfa/parser/cxfa_subjectdn.cpp b/xfa/fxfa/parser/cxfa_subjectdn.cpp index 989fd9e96e..65ee274558 100644 --- a/xfa/fxfa/parser/cxfa_subjectdn.cpp +++ b/xfa/fxfa/parser/cxfa_subjectdn.cpp @@ -9,26 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Delimiter, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Delimiter, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"subjectDN"; diff --git a/xfa/fxfa/parser/cxfa_subjectdns.cpp b/xfa/fxfa/parser/cxfa_subjectdns.cpp index d2c370aa66..20d2b252a4 100644 --- a/xfa/fxfa/parser/cxfa_subjectdns.cpp +++ b/xfa/fxfa/parser/cxfa_subjectdns.cpp @@ -9,22 +9,12 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"subjectDNs"; diff --git a/xfa/fxfa/parser/cxfa_submit.cpp b/xfa/fxfa/parser/cxfa_submit.cpp index 65ba8f58bc..36bdbf0152 100644 --- a/xfa/fxfa/parser/cxfa_submit.cpp +++ b/xfa/fxfa/parser/cxfa_submit.cpp @@ -11,30 +11,16 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Encrypt, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Format, XFA_AttributeType::Enum, - XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Xdp}, - {XFA_Attribute::EmbedPDF, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Target, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::TextEncoding, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::XdpContent, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::EmbedPDF, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Target, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::TextEncoding, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::XdpContent, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"submit"; diff --git a/xfa/fxfa/parser/cxfa_submitformat.cpp b/xfa/fxfa/parser/cxfa_submitformat.cpp index 6c38479611..54ffe52d18 100644 --- a/xfa/fxfa/parser/cxfa_submitformat.cpp +++ b/xfa/fxfa/parser/cxfa_submitformat.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"submitFormat"; diff --git a/xfa/fxfa/parser/cxfa_submiturl.cpp b/xfa/fxfa/parser/cxfa_submiturl.cpp index ccbffeea04..2f19a1d9fe 100644 --- a/xfa/fxfa/parser/cxfa_submiturl.cpp +++ b/xfa/fxfa/parser/cxfa_submiturl.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"submitUrl"; diff --git a/xfa/fxfa/parser/cxfa_subsetbelow.cpp b/xfa/fxfa/parser/cxfa_subsetbelow.cpp index 8150992538..7154877b94 100644 --- a/xfa/fxfa/parser/cxfa_subsetbelow.cpp +++ b/xfa/fxfa/parser/cxfa_subsetbelow.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"subsetBelow"; diff --git a/xfa/fxfa/parser/cxfa_suppressbanner.cpp b/xfa/fxfa/parser/cxfa_suppressbanner.cpp index f101351945..e1cfd92b0e 100644 --- a/xfa/fxfa/parser/cxfa_suppressbanner.cpp +++ b/xfa/fxfa/parser/cxfa_suppressbanner.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"suppressBanner"; diff --git a/xfa/fxfa/parser/cxfa_tagged.cpp b/xfa/fxfa/parser/cxfa_tagged.cpp index 2612f10970..ce9e15f540 100644 --- a/xfa/fxfa/parser/cxfa_tagged.cpp +++ b/xfa/fxfa/parser/cxfa_tagged.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"tagged"; diff --git a/xfa/fxfa/parser/cxfa_template.cpp b/xfa/fxfa/parser/cxfa_template.cpp index d7c5aae01a..b70bb533b1 100644 --- a/xfa/fxfa/parser/cxfa_template.cpp +++ b/xfa/fxfa/parser/cxfa_template.cpp @@ -14,14 +14,11 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Base, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::BaseProfile, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Full}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"template"; diff --git a/xfa/fxfa/parser/cxfa_templatecache.cpp b/xfa/fxfa/parser/cxfa_templatecache.cpp index 1dfa833d45..9f407e4d4e 100644 --- a/xfa/fxfa/parser/cxfa_templatecache.cpp +++ b/xfa/fxfa/parser/cxfa_templatecache.cpp @@ -9,13 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::MaxEntries, XFA_AttributeType::Integer, - XFA_XDPPACKET_Config, (void*)5}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::MaxEntries, XFA_AttributeType::Integer, (void*)5}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"templateCache"; diff --git a/xfa/fxfa/parser/cxfa_text.cpp b/xfa/fxfa/parser/cxfa_text.cpp index ab297f08c0..816a5fc5c1 100644 --- a/xfa/fxfa/parser/cxfa_text.cpp +++ b/xfa/fxfa/parser/cxfa_text.cpp @@ -9,28 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rid, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::MaxChars, XFA_AttributeType::Integer, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rid, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::MaxChars, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"text"; diff --git a/xfa/fxfa/parser/cxfa_textedit.cpp b/xfa/fxfa/parser/cxfa_textedit.cpp index db9a8a72ce..17e96a0415 100644 --- a/xfa/fxfa/parser/cxfa_textedit.cpp +++ b/xfa/fxfa/parser/cxfa_textedit.cpp @@ -14,29 +14,16 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::VScrollPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::AllowRichText, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::MultiLine, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::AllowRichText, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::MultiLine, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::HScrollPolicy, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Auto}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"textEdit"; diff --git a/xfa/fxfa/parser/cxfa_threshold.cpp b/xfa/fxfa/parser/cxfa_threshold.cpp index 09ac30f83d..b50c63afef 100644 --- a/xfa/fxfa/parser/cxfa_threshold.cpp +++ b/xfa/fxfa/parser/cxfa_threshold.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"threshold"; diff --git a/xfa/fxfa/parser/cxfa_time.cpp b/xfa/fxfa/parser/cxfa_time.cpp index e10c15ae0c..89307d69cd 100644 --- a/xfa/fxfa/parser/cxfa_time.cpp +++ b/xfa/fxfa/parser/cxfa_time.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"time"; diff --git a/xfa/fxfa/parser/cxfa_timepattern.cpp b/xfa/fxfa/parser/cxfa_timepattern.cpp index 6baea236bb..5535e9f6a2 100644 --- a/xfa/fxfa/parser/cxfa_timepattern.cpp +++ b/xfa/fxfa/parser/cxfa_timepattern.cpp @@ -10,11 +10,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Name, XFA_AttributeType::Enum, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Med}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"timePattern"; diff --git a/xfa/fxfa/parser/cxfa_timestamp.cpp b/xfa/fxfa/parser/cxfa_timestamp.cpp index 891e3440d4..3edd59ed2d 100644 --- a/xfa/fxfa/parser/cxfa_timestamp.cpp +++ b/xfa/fxfa/parser/cxfa_timestamp.cpp @@ -9,24 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Optional}, - {XFA_Attribute::Server, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Server, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"timeStamp"; diff --git a/xfa/fxfa/parser/cxfa_to.cpp b/xfa/fxfa/parser/cxfa_to.cpp index 1acd195182..678c13d388 100644 --- a/xfa/fxfa/parser/cxfa_to.cpp +++ b/xfa/fxfa/parser/cxfa_to.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"to"; diff --git a/xfa/fxfa/parser/cxfa_tooltip.cpp b/xfa/fxfa/parser/cxfa_tooltip.cpp index 54f36a7541..5d4ecfa262 100644 --- a/xfa/fxfa/parser/cxfa_tooltip.cpp +++ b/xfa/fxfa/parser/cxfa_tooltip.cpp @@ -9,21 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Rid, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Rid, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"toolTip"; diff --git a/xfa/fxfa/parser/cxfa_trace.cpp b/xfa/fxfa/parser/cxfa_trace.cpp index 54a7993f10..64a872bef2 100644 --- a/xfa/fxfa/parser/cxfa_trace.cpp +++ b/xfa/fxfa/parser/cxfa_trace.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"trace"; diff --git a/xfa/fxfa/parser/cxfa_transform.cpp b/xfa/fxfa/parser/cxfa_transform.cpp index 24428d057a..d69d84f722 100644 --- a/xfa/fxfa/parser/cxfa_transform.cpp +++ b/xfa/fxfa/parser/cxfa_transform.cpp @@ -14,15 +14,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Picture, 1, 0}, {XFA_Element::NameAttr, 1, 0}, {XFA_Element::GroupParent, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"transform"; diff --git a/xfa/fxfa/parser/cxfa_traversal.cpp b/xfa/fxfa/parser/cxfa_traversal.cpp index 852853aef9..47e6822f0e 100644 --- a/xfa/fxfa/parser/cxfa_traversal.cpp +++ b/xfa/fxfa/parser/cxfa_traversal.cpp @@ -11,19 +11,10 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"traversal"; diff --git a/xfa/fxfa/parser/cxfa_traverse.cpp b/xfa/fxfa/parser/cxfa_traverse.cpp index cd6fd6b65e..46018e3eae 100644 --- a/xfa/fxfa/parser/cxfa_traverse.cpp +++ b/xfa/fxfa/parser/cxfa_traverse.cpp @@ -12,26 +12,13 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Script, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Ref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_Template | - XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Ref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Operation, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Next}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"traverse"; diff --git a/xfa/fxfa/parser/cxfa_type.cpp b/xfa/fxfa/parser/cxfa_type.cpp index 9844c12def..3be441551a 100644 --- a/xfa/fxfa/parser/cxfa_type.cpp +++ b/xfa/fxfa/parser/cxfa_type.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"type"; diff --git a/xfa/fxfa/parser/cxfa_typeface.cpp b/xfa/fxfa/parser/cxfa_typeface.cpp index bb866eb9d0..7c78bceaee 100644 --- a/xfa/fxfa/parser/cxfa_typeface.cpp +++ b/xfa/fxfa/parser/cxfa_typeface.cpp @@ -9,12 +9,8 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"typeface"; diff --git a/xfa/fxfa/parser/cxfa_ui.cpp b/xfa/fxfa/parser/cxfa_ui.cpp index f061f20770..d0d5c302f4 100644 --- a/xfa/fxfa/parser/cxfa_ui.cpp +++ b/xfa/fxfa/parser/cxfa_ui.cpp @@ -25,19 +25,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"ui"; diff --git a/xfa/fxfa/parser/cxfa_update.cpp b/xfa/fxfa/parser/cxfa_update.cpp index 4b49258c76..ff94e0141c 100644 --- a/xfa/fxfa/parser/cxfa_update.cpp +++ b/xfa/fxfa/parser/cxfa_update.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"update"; diff --git a/xfa/fxfa/parser/cxfa_uri.cpp b/xfa/fxfa/parser/cxfa_uri.cpp index a0ee552890..d3c6166d8a 100644 --- a/xfa/fxfa/parser/cxfa_uri.cpp +++ b/xfa/fxfa/parser/cxfa_uri.cpp @@ -9,28 +9,13 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"uri"; diff --git a/xfa/fxfa/parser/cxfa_user.cpp b/xfa/fxfa/parser/cxfa_user.cpp index 47ef478244..62a3634705 100644 --- a/xfa/fxfa/parser/cxfa_user.cpp +++ b/xfa/fxfa/parser/cxfa_user.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"user"; diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp index a70605de27..9bf39e1aba 100644 --- a/xfa/fxfa/parser/cxfa_validate.cpp +++ b/xfa/fxfa/parser/cxfa_validate.cpp @@ -14,32 +14,18 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Message, 1, 0}, {XFA_Element::Extras, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::ScriptTest, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Error}, {XFA_Attribute::NullTest, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Disabled}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::FormatTest, XFA_AttributeType::Enum, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)XFA_ATTRIBUTEENUM_Warning}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"validate"; diff --git a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp index 8026b5d1f5..971bbec959 100644 --- a/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp +++ b/xfa/fxfa/parser/cxfa_validateapprovalsignatures.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"validateApprovalSignatures"; diff --git a/xfa/fxfa/parser/cxfa_validationmessaging.cpp b/xfa/fxfa/parser/cxfa_validationmessaging.cpp index ba6e0babe0..f7ff87739e 100644 --- a/xfa/fxfa/parser/cxfa_validationmessaging.cpp +++ b/xfa/fxfa/parser/cxfa_validationmessaging.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"validationMessaging"; diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index 791dd52e58..02450b44a8 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -24,23 +24,12 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::Line, 1, XFA_PROPERTYFLAG_OneOf}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Relevant, XFA_AttributeType::CData, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Override, XFA_AttributeType::Boolean, - XFA_XDPPACKET_Template | XFA_XDPPACKET_Form, (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Relevant, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Override, XFA_AttributeType::Boolean, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"value"; diff --git a/xfa/fxfa/parser/cxfa_variables.cpp b/xfa/fxfa/parser/cxfa_variables.cpp index 8625437060..0014c20d95 100644 --- a/xfa/fxfa/parser/cxfa_variables.cpp +++ b/xfa/fxfa/parser/cxfa_variables.cpp @@ -9,19 +9,10 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"variables"; diff --git a/xfa/fxfa/parser/cxfa_version.cpp b/xfa/fxfa/parser/cxfa_version.cpp index 003eb6aaf7..ac9d3083c3 100644 --- a/xfa/fxfa/parser/cxfa_version.cpp +++ b/xfa/fxfa/parser/cxfa_version.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"version"; diff --git a/xfa/fxfa/parser/cxfa_versioncontrol.cpp b/xfa/fxfa/parser/cxfa_versioncontrol.cpp index 90a9caa6e3..d2920dd07a 100644 --- a/xfa/fxfa/parser/cxfa_versioncontrol.cpp +++ b/xfa/fxfa/parser/cxfa_versioncontrol.cpp @@ -9,15 +9,14 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::SourceBelow, XFA_AttributeType::Enum, XFA_XDPPACKET_Config, + {XFA_Attribute::SourceBelow, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_Update}, - {XFA_Attribute::OutputBelow, XFA_AttributeType::Enum, XFA_XDPPACKET_Config, + {XFA_Attribute::OutputBelow, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_Warn}, - {XFA_Attribute::SourceAbove, XFA_AttributeType::Enum, XFA_XDPPACKET_Config, + {XFA_Attribute::SourceAbove, XFA_AttributeType::Enum, (void*)XFA_ATTRIBUTEENUM_Warn}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"versionControl"; diff --git a/xfa/fxfa/parser/cxfa_viewerpreferences.cpp b/xfa/fxfa/parser/cxfa_viewerpreferences.cpp index 57ab3b7018..c3bbd27fad 100644 --- a/xfa/fxfa/parser/cxfa_viewerpreferences.cpp +++ b/xfa/fxfa/parser/cxfa_viewerpreferences.cpp @@ -20,11 +20,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::PickTrayByPDFSize, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"viewerPreferences"; diff --git a/xfa/fxfa/parser/cxfa_webclient.cpp b/xfa/fxfa/parser/cxfa_webclient.cpp index bc2010e38a..ceb6cb0461 100644 --- a/xfa/fxfa/parser/cxfa_webclient.cpp +++ b/xfa/fxfa/parser/cxfa_webclient.cpp @@ -12,16 +12,10 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::FontInfo, 1, 0}, {XFA_Element::Xdc, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"webClient"; diff --git a/xfa/fxfa/parser/cxfa_whitespace.cpp b/xfa/fxfa/parser/cxfa_whitespace.cpp index 0d1d9251bb..874a3274dc 100644 --- a/xfa/fxfa/parser/cxfa_whitespace.cpp +++ b/xfa/fxfa/parser/cxfa_whitespace.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"whitespace"; diff --git a/xfa/fxfa/parser/cxfa_window.cpp b/xfa/fxfa/parser/cxfa_window.cpp index 23e32f328b..d484076096 100644 --- a/xfa/fxfa/parser/cxfa_window.cpp +++ b/xfa/fxfa/parser/cxfa_window.cpp @@ -9,11 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"window"; diff --git a/xfa/fxfa/parser/cxfa_wsdladdress.cpp b/xfa/fxfa/parser/cxfa_wsdladdress.cpp index 6b5d11aa37..c958d4182d 100644 --- a/xfa/fxfa/parser/cxfa_wsdladdress.cpp +++ b/xfa/fxfa/parser/cxfa_wsdladdress.cpp @@ -9,24 +9,11 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Id, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Use, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Usehref, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Template | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"wsdlAddress"; diff --git a/xfa/fxfa/parser/cxfa_wsdlconnection.cpp b/xfa/fxfa/parser/cxfa_wsdlconnection.cpp index dd3f54d5ea..370cd4f053 100644 --- a/xfa/fxfa/parser/cxfa_wsdlconnection.cpp +++ b/xfa/fxfa/parser/cxfa_wsdlconnection.cpp @@ -17,14 +17,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::EffectiveInputPolicy, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataDescription, XFA_AttributeType::CData, - XFA_XDPPACKET_ConnectionSet, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataDescription, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"wsdlConnection"; diff --git a/xfa/fxfa/parser/cxfa_xdc.cpp b/xfa/fxfa/parser/cxfa_xdc.cpp index ca7dca13b1..2578c432bf 100644 --- a/xfa/fxfa/parser/cxfa_xdc.cpp +++ b/xfa/fxfa/parser/cxfa_xdc.cpp @@ -12,11 +12,9 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Uri, 1, 0}, {XFA_Element::Xsl, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xdc"; diff --git a/xfa/fxfa/parser/cxfa_xdp.cpp b/xfa/fxfa/parser/cxfa_xdp.cpp index 9e6a43086c..cb090f3954 100644 --- a/xfa/fxfa/parser/cxfa_xdp.cpp +++ b/xfa/fxfa/parser/cxfa_xdp.cpp @@ -11,11 +11,9 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Packets, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xdp"; diff --git a/xfa/fxfa/parser/cxfa_xfa.cpp b/xfa/fxfa/parser/cxfa_xfa.cpp index c3dc43e1c7..9fc6dc379a 100644 --- a/xfa/fxfa/parser/cxfa_xfa.cpp +++ b/xfa/fxfa/parser/cxfa_xfa.cpp @@ -9,10 +9,9 @@ namespace { const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::TimeStamp, XFA_AttributeType::CData, XFA_XDPPACKET_XDP, - nullptr}, - {XFA_Attribute::Uuid, XFA_AttributeType::CData, XFA_XDPPACKET_XDP, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::TimeStamp, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Uuid, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xfa"; diff --git a/xfa/fxfa/parser/cxfa_xmlconnection.cpp b/xfa/fxfa/parser/cxfa_xmlconnection.cpp index 56376cf20e..c67f68419e 100644 --- a/xfa/fxfa/parser/cxfa_xmlconnection.cpp +++ b/xfa/fxfa/parser/cxfa_xmlconnection.cpp @@ -11,14 +11,9 @@ namespace { const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Uri, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataDescription, XFA_AttributeType::CData, - XFA_XDPPACKET_ConnectionSet, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataDescription, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xmlConnection"; diff --git a/xfa/fxfa/parser/cxfa_xsdconnection.cpp b/xfa/fxfa/parser/cxfa_xsdconnection.cpp index 08c662a732..45fc5137a4 100644 --- a/xfa/fxfa/parser/cxfa_xsdconnection.cpp +++ b/xfa/fxfa/parser/cxfa_xsdconnection.cpp @@ -13,14 +13,9 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::RootElement, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::DataDescription, XFA_AttributeType::CData, - XFA_XDPPACKET_ConnectionSet, nullptr}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::DataDescription, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xsdConnection"; diff --git a/xfa/fxfa/parser/cxfa_xsl.cpp b/xfa/fxfa/parser/cxfa_xsl.cpp index e3fda71fd2..0cbced114e 100644 --- a/xfa/fxfa/parser/cxfa_xsl.cpp +++ b/xfa/fxfa/parser/cxfa_xsl.cpp @@ -12,11 +12,9 @@ const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Uri, 1, 0}, {XFA_Element::Debug, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"xsl"; diff --git a/xfa/fxfa/parser/cxfa_zpl.cpp b/xfa/fxfa/parser/cxfa_zpl.cpp index cdd4f17856..2ded6d0e5c 100644 --- a/xfa/fxfa/parser/cxfa_zpl.cpp +++ b/xfa/fxfa/parser/cxfa_zpl.cpp @@ -15,16 +15,10 @@ const CXFA_Node::PropertyData kPropertyData[] = { {XFA_Element::FlipLabel, 1, 0}, {XFA_Element::Unknown, 0, 0}}; const CXFA_Node::AttributeData kAttributeData[] = { - {XFA_Attribute::Name, XFA_AttributeType::CData, - XFA_XDPPACKET_SourceSet | XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet | - XFA_XDPPACKET_Template | XFA_XDPPACKET_Datasets | XFA_XDPPACKET_Form | - XFA_XDPPACKET_ConnectionSet | XFA_XDPPACKET_Form, - nullptr}, - {XFA_Attribute::Desc, XFA_AttributeType::CData, - XFA_XDPPACKET_Config | XFA_XDPPACKET_LocaleSet, nullptr}, - {XFA_Attribute::Lock, XFA_AttributeType::Integer, XFA_XDPPACKET_Config, - (void*)0}, - {XFA_Attribute::Unknown, XFA_AttributeType::Integer, 0, nullptr}}; + {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Desc, XFA_AttributeType::CData, nullptr}, + {XFA_Attribute::Lock, XFA_AttributeType::Integer, (void*)0}, + {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; constexpr wchar_t kName[] = L"zpl"; |