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_validatedata.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_validatedata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_validatedata.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/cxfa_validatedata.cpp b/xfa/fxfa/parser/cxfa_validatedata.cpp index 756ddf23bf..9e811df572 100644 --- a/xfa/fxfa/parser/cxfa_validatedata.cpp +++ b/xfa/fxfa/parser/cxfa_validatedata.cpp @@ -12,24 +12,24 @@ CXFA_ValidateData::CXFA_ValidateData(CXFA_Node* pNode) : CXFA_Data(pNode) {} int32_t CXFA_ValidateData::GetFormatTest() { - return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_FormatTest); + return m_pNode->JSNode()->GetEnum(XFA_Attribute::FormatTest); } bool CXFA_ValidateData::SetNullTest(WideString wsValue) { const XFA_ATTRIBUTEENUMINFO* pInfo = XFA_GetAttributeEnumByName(wsValue.AsStringView()); - m_pNode->JSNode()->SetEnum(XFA_ATTRIBUTE_NullTest, + m_pNode->JSNode()->SetEnum(XFA_Attribute::NullTest, pInfo ? pInfo->eName : XFA_ATTRIBUTEENUM_Disabled, false); return true; } int32_t CXFA_ValidateData::GetNullTest() { - return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_NullTest); + return m_pNode->JSNode()->GetEnum(XFA_Attribute::NullTest); } int32_t CXFA_ValidateData::GetScriptTest() { - return m_pNode->JSNode()->GetEnum(XFA_ATTRIBUTE_ScriptTest); + return m_pNode->JSNode()->GetEnum(XFA_Attribute::ScriptTest); } void CXFA_ValidateData::GetMessageText(WideString& wsMessage, @@ -46,7 +46,7 @@ void CXFA_ValidateData::GetMessageText(WideString& wsMessage, continue; WideStringView wsName; - pItemNode->JSNode()->TryCData(XFA_ATTRIBUTE_Name, wsName, true); + pItemNode->JSNode()->TryCData(XFA_Attribute::Name, wsName, true); if (wsName.IsEmpty() || wsName == wsMessageType) { pItemNode->JSNode()->TryContent(wsMessage, false, true); return; @@ -84,7 +84,7 @@ void CXFA_ValidateData::SetMessageText(WideString& wsMessage, continue; WideStringView wsName; - pItemNode->JSNode()->TryCData(XFA_ATTRIBUTE_Name, wsName, true); + pItemNode->JSNode()->TryCData(XFA_Attribute::Name, wsName, true); if (wsName.IsEmpty() || wsName == wsMessageType) { pItemNode->JSNode()->SetContent(wsMessage, wsMessage, false, false, true); return; @@ -92,7 +92,7 @@ void CXFA_ValidateData::SetMessageText(WideString& wsMessage, } CXFA_Node* pTextNode = pNode->CreateSamePacketNode(XFA_Element::Text); pNode->InsertChild(pTextNode, nullptr); - pTextNode->JSNode()->SetCData(XFA_ATTRIBUTE_Name, wsMessageType, false, + pTextNode->JSNode()->SetCData(XFA_Attribute::Name, wsMessageType, false, false); pTextNode->JSNode()->SetContent(wsMessage, wsMessage, false, false, true); } |