diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-02-07 19:57:25 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-02-07 19:57:25 +0000 |
| commit | ec7d8e21e72562d664e9596cb73bae6da8d6703c (patch) | |
| tree | 7a9f8863d2817e72fc0fab18e1522ff1834fbe24 /xfa/fxfa/parser/cxfa_occur.cpp | |
| parent | c0c32b0a3af11624a1f3eaeb9d940d525b54cd4d (diff) | |
| download | pdfium-ec7d8e21e72562d664e9596cb73bae6da8d6703c.tar.xz | |
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 <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_occur.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occur.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_occur.cpp b/xfa/fxfa/parser/cxfa_occur.cpp index 7be3f7066d..0e16ef25c4 100644 --- a/xfa/fxfa/parser/cxfa_occur.cpp +++ b/xfa/fxfa/parser/cxfa_occur.cpp @@ -11,9 +11,10 @@ namespace { -const CXFA_Node::PropertyData kPropertyData[] = {{XFA_Element::Extras, 1, 0}, - {XFA_Element::Unknown, 0, 0}}; -const CXFA_Node::AttributeData kAttributeData[] = { +const CXFA_Node::PropertyData kOccurPropertyData[] = { + {XFA_Element::Extras, 1, 0}, + {XFA_Element::Unknown, 0, 0}}; +const CXFA_Node::AttributeData kOccurAttributeData[] = { {XFA_Attribute::Id, XFA_AttributeType::CData, nullptr}, {XFA_Attribute::Max, XFA_AttributeType::Integer, (void*)1}, {XFA_Attribute::Min, XFA_AttributeType::Integer, (void*)1}, @@ -22,7 +23,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"occur"; +constexpr wchar_t kOccurName[] = L"occur"; } // namespace @@ -32,9 +33,9 @@ CXFA_Occur::CXFA_Occur(CXFA_Document* doc, XFA_PacketType packet) (XFA_XDPPACKET_Template | XFA_XDPPACKET_Form), XFA_ObjectType::Node, XFA_Element::Occur, - kPropertyData, - kAttributeData, - kName, + kOccurPropertyData, + kOccurAttributeData, + kOccurName, pdfium::MakeUnique<CJX_Occur>(this)) {} CXFA_Occur::~CXFA_Occur() {} |