From ec7d8e21e72562d664e9596cb73bae6da8d6703c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 7 Feb 2018 19:57:25 +0000 Subject: Make xfa_fxfa_parser target jumbo capable. Mechanically uniquify all the kFoo variables in xfa/fxfa/parser. BUG=pdfium:964 Change-Id: Iffe15015282d572147f31f2101fa0127f2198620 Reviewed-on: https://pdfium-review.googlesource.com/25890 Reviewed-by: dsinclair Commit-Queue: Lei Zhang --- xfa/fxfa/parser/cxfa_choicelist.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_choicelist.cpp') diff --git a/xfa/fxfa/parser/cxfa_choicelist.cpp b/xfa/fxfa/parser/cxfa_choicelist.cpp index bf95ef9498..0adf645732 100644 --- a/xfa/fxfa/parser/cxfa_choicelist.cpp +++ b/xfa/fxfa/parser/cxfa_choicelist.cpp @@ -11,11 +11,12 @@ namespace { -const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Margin, 1, 0}, - {XFA_Element::Border, 1, 0}, - {XFA_Element::Extras, 1, 0}, - {XFA_Element::Unknown, 0, 0}}; -const CXFA_Node::AttributeData kAttributeData[] = { +const CXFA_Node::PropertyData kChoiceListPropertyData[] = { + {XFA_Element::Margin, 1, 0}, + {XFA_Element::Border, 1, 0}, + {XFA_Element::Extras, 1, 0}, + {XFA_Element::Unknown, 0, 0}}; +const CXFA_Node::AttributeData kChoiceListAttributeData[] = { {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Open, XFA_AttributeType::Enum, @@ -26,7 +27,7 @@ const CXFA_Node::AttributeData kAttributeData[] = { {XFA_Attribute::Usehref, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; -constexpr wchar_t kName[] = L"choiceList"; +constexpr wchar_t kChoiceListName[] = L"choiceList"; } // namespace @@ -36,9 +37,9 @@ CXFA_ChoiceList::CXFA_ChoiceList(CXFA_Document* doc, XFA_PacketType packet) (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), XFA_ObjectType::Node, XFA_Element::ChoiceList, - kPropertyData, - kAttributeData, - kName, + kChoiceListPropertyData, + kChoiceListAttributeData, + kChoiceListName, pdfium::MakeUnique(this)) {} CXFA_ChoiceList::~CXFA_ChoiceList() {} -- cgit v1.2.3