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_pattern.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_pattern.cpp') diff --git a/xfa/fxfa/parser/cxfa_pattern.cpp b/xfa/fxfa/parser/cxfa_pattern.cpp index 4cd32cced8..f5809258a0 100644 --- a/xfa/fxfa/parser/cxfa_pattern.cpp +++ b/xfa/fxfa/parser/cxfa_pattern.cpp @@ -13,10 +13,11 @@ namespace { -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[] = { +const CXFA_Node::PropertyData kPatternPropertyData[] = { + {XFA_Element::Color, 1, 0}, + {XFA_Element::Extras, 1, 0}, + {XFA_Element::Unknown, 0, 0}}; +const CXFA_Node::AttributeData kPatternAttributeData[] = { {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Type, XFA_AttributeType::Enum, @@ -24,7 +25,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"pattern"; +constexpr wchar_t kPatternName[] = L"pattern"; } // namespace @@ -34,9 +35,9 @@ CXFA_Pattern::CXFA_Pattern(CXFA_Document* doc, XFA_PacketType packet) (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), XFA_ObjectType::Node, XFA_Element::Pattern, - kPropertyData, - kAttributeData, - kName, + kPatternPropertyData, + kPatternAttributeData, + kPatternName, pdfium::MakeUnique(this)) {} CXFA_Pattern::~CXFA_Pattern() {} -- cgit v1.2.3