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/cxfa_para.cpp | |
| 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/cxfa_para.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_para.cpp | 56 |
1 files changed, 17 insertions, 39 deletions
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"; |