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_pagearea.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_pagearea.cpp') diff --git a/xfa/fxfa/parser/cxfa_pagearea.cpp b/xfa/fxfa/parser/cxfa_pagearea.cpp index f82b3443d2..b67efbc6a0 100644 --- a/xfa/fxfa/parser/cxfa_pagearea.cpp +++ b/xfa/fxfa/parser/cxfa_pagearea.cpp @@ -11,12 +11,13 @@ namespace { -const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Medium, 1, 0}, - {XFA_Element::Desc, 1, 0}, - {XFA_Element::Extras, 1, 0}, - {XFA_Element::Occur, 1, 0}, - {XFA_Element::Unknown, 0, 0}}; -const CXFA_Node::AttributeData kAttributeData[] = { +const CXFA_Node::PropertyData kPageAreaPropertyData[] = { + {XFA_Element::Medium, 1, 0}, + {XFA_Element::Desc, 1, 0}, + {XFA_Element::Extras, 1, 0}, + {XFA_Element::Occur, 1, 0}, + {XFA_Element::Unknown, 0, 0}}; +const CXFA_Node::AttributeData kPageAreaAttributeData[] = { {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Name, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Use, XFA_AttributeType::CData, nullptr}, @@ -32,7 +33,7 @@ const CXFA_Node::AttributeData kAttributeData[] = { (void*)XFA_AttributeEnum::Any}, {XFA_Attribute::Unknown, XFA_AttributeType::Integer, nullptr}}; -constexpr wchar_t kName[] = L"pageArea"; +constexpr wchar_t kPageAreaName[] = L"pageArea"; } // namespace @@ -42,9 +43,9 @@ CXFA_PageArea::CXFA_PageArea(CXFA_Document* doc, XFA_PacketType packet) (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), XFA_ObjectType::ContainerNode, XFA_Element::PageArea, - kPropertyData, - kAttributeData, - kName, + kPageAreaPropertyData, + kPageAreaAttributeData, + kPageAreaName, pdfium::MakeUnique(this)) {} CXFA_PageArea::~CXFA_PageArea() {} -- cgit v1.2.3