diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-08 18:01:31 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-08 18:01:31 +0000 |
| commit | 1d86501aa9ee49890fbb43db60333a42f947cd74 (patch) | |
| tree | 65b0c342fa74b11371a640c4444b87b6d6a6f5ba /xfa/fxfa/parser/cxfa_document.cpp | |
| parent | 7055dffad92bd7be7cdb20ed12d5cc5890177e7a (diff) | |
| download | pdfium-1d86501aa9ee49890fbb43db60333a42f947cd74.tar.xz | |
Convert XFA_ATTRIBUTE to an enum class
This CL converts the XFA_ATTRIBUTE enum to an enum class and fixes up
various usages.
Change-Id: I3dd17cc412d97eb212a65ce63bb9fa19605e1e91
Reviewed-on: https://pdfium-review.googlesource.com/18050
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 66778cdcfc..0489ae696c 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -335,7 +335,7 @@ CXFA_Node* CXFA_Document::GetNodeByID(CXFA_Node* pRoot, for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { WideStringView wsIDVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal, true) && + if (pNode->JSNode()->TryCData(XFA_Attribute::Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { if (wsIDVal == wsID) return pNode; @@ -355,15 +355,15 @@ void CXFA_Document::DoProtoMerge() { for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { WideStringView wsIDVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal, true) && + if (pNode->JSNode()->TryCData(XFA_Attribute::Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { mIDMap[FX_HashCode_GetW(wsIDVal, false)] = pNode; } WideStringView wsUseVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal, true) && + if (pNode->JSNode()->TryCData(XFA_Attribute::Use, wsUseVal, true) && !wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); - } else if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal, + } else if (pNode->JSNode()->TryCData(XFA_Attribute::Usehref, wsUseVal, true) && !wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); @@ -373,7 +373,7 @@ void CXFA_Document::DoProtoMerge() { for (CXFA_Node* pUseHrefNode : sUseNodes) { WideString wsUseVal; WideStringView wsURI, wsID, wsSOM; - if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal, + if (pUseHrefNode->JSNode()->TryCData(XFA_Attribute::Usehref, wsUseVal, true) && !wsUseVal.IsEmpty()) { auto uSharpPos = wsUseVal.Find('#'); @@ -393,7 +393,7 @@ void CXFA_Document::DoProtoMerge() { uLen - uSharpPos.value() - 1); } } - } else if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal, + } else if (pUseHrefNode->JSNode()->TryCData(XFA_Attribute::Use, wsUseVal, true) && !wsUseVal.IsEmpty()) { if (wsUseVal[0] == '#') |