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_occurdata.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_occurdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_occurdata.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/parser/cxfa_occurdata.cpp b/xfa/fxfa/parser/cxfa_occurdata.cpp index 3bbe00cd35..1ef5a296fc 100644 --- a/xfa/fxfa/parser/cxfa_occurdata.cpp +++ b/xfa/fxfa/parser/cxfa_occurdata.cpp @@ -13,7 +13,7 @@ CXFA_OccurData::CXFA_OccurData(CXFA_Node* pNode) : CXFA_Data(pNode) {} int32_t CXFA_OccurData::GetMax() { int32_t iMax = 1; if (m_pNode) { - if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Max, iMax, true)) + if (!m_pNode->JSNode()->TryInteger(XFA_Attribute::Max, iMax, true)) iMax = GetMin(); } return iMax; @@ -22,7 +22,7 @@ int32_t CXFA_OccurData::GetMax() { int32_t CXFA_OccurData::GetMin() { int32_t iMin = 1; if (m_pNode) { - if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Min, iMin, true) || + if (!m_pNode->JSNode()->TryInteger(XFA_Attribute::Min, iMin, true) || iMin < 0) iMin = 1; } @@ -34,16 +34,16 @@ bool CXFA_OccurData::GetOccurInfo(int32_t& iMin, int32_t& iInit) { if (!m_pNode) return false; - if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Min, iMin, false) || + if (!m_pNode->JSNode()->TryInteger(XFA_Attribute::Min, iMin, false) || iMin < 0) iMin = 1; - if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Max, iMax, false)) { + if (!m_pNode->JSNode()->TryInteger(XFA_Attribute::Max, iMax, false)) { if (iMin == 0) iMax = 1; else iMax = iMin; } - if (!m_pNode->JSNode()->TryInteger(XFA_ATTRIBUTE_Initial, iInit, false) || + if (!m_pNode->JSNode()->TryInteger(XFA_Attribute::Initial, iInit, false) || iInit < iMin) { iInit = iMin; } @@ -52,20 +52,20 @@ bool CXFA_OccurData::GetOccurInfo(int32_t& iMin, void CXFA_OccurData::SetMax(int32_t iMax) { iMax = (iMax != -1 && iMax < 1) ? 1 : iMax; - m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); + m_pNode->JSNode()->SetInteger(XFA_Attribute::Max, iMax, false); int32_t iMin = GetMin(); if (iMax != -1 && iMax < iMin) { iMin = iMax; - m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); + m_pNode->JSNode()->SetInteger(XFA_Attribute::Min, iMin, false); } } void CXFA_OccurData::SetMin(int32_t iMin) { iMin = (iMin < 0) ? 1 : iMin; - m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Min, iMin, false); + m_pNode->JSNode()->SetInteger(XFA_Attribute::Min, iMin, false); int32_t iMax = GetMax(); if (iMax > 0 && iMax < iMin) { iMax = iMin; - m_pNode->JSNode()->SetInteger(XFA_ATTRIBUTE_Max, iMax, false); + m_pNode->JSNode()->SetInteger(XFA_Attribute::Max, iMax, false); } } |