diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-08 18:02:12 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-08 18:02:12 +0000 |
| commit | 6bccc1228ddfccae296f8f4236512caad7cbc1c9 (patch) | |
| tree | be2115f4aabd95938a3babdf1b9229a1a633e20a /xfa/fxfa/parser/xfa_utils.cpp | |
| parent | 1d86501aa9ee49890fbb43db60333a42f947cd74 (diff) | |
| download | pdfium-6bccc1228ddfccae296f8f4236512caad7cbc1c9.tar.xz | |
Convert XFA_ATTRIBUTETYPE to an enum class
This CL converts XFA_ATTRIBUTETYPE to an enum class XFA_AttributeType.
Change-Id: I76185da08fcc8a7a4026ce430238db1b2cecf192
Reviewed-on: https://pdfium-review.googlesource.com/18051
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/xfa_utils.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_utils.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fxfa/parser/xfa_utils.cpp b/xfa/fxfa/parser/xfa_utils.cpp index 8cb9bef4a2..e5091eec0f 100644 --- a/xfa/fxfa/parser/xfa_utils.cpp +++ b/xfa/fxfa/parser/xfa_utils.cpp @@ -272,14 +272,14 @@ const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName( const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, XFA_Attribute eAttribute, - XFA_ATTRIBUTETYPE eType) { + XFA_AttributeType eType) { int32_t iStart = 0, iEnd = g_iXFANotsureCount - 1; do { int32_t iMid = (iStart + iEnd) / 2; const XFA_NOTSUREATTRIBUTE* pAttr = g_XFANotsureAttributes + iMid; if (eElement == pAttr->eElement) { if (pAttr->attribute == eAttribute) { - if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) + if (eType == XFA_AttributeType::NotSure || eType == pAttr->eType) return pAttr; return nullptr; } @@ -288,7 +288,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, pAttr = g_XFANotsureAttributes + iBefore; while (eElement == pAttr->eElement) { if (pAttr->attribute == eAttribute) { - if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) + if (eType == XFA_AttributeType::NotSure || eType == pAttr->eType) return pAttr; return nullptr; } @@ -305,7 +305,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, pAttr = g_XFANotsureAttributes + iAfter; while (eElement == pAttr->eElement) { if (pAttr->attribute == eAttribute) { - if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) + if (eType == XFA_AttributeType::NotSure || eType == pAttr->eType) return pAttr; return nullptr; } @@ -398,7 +398,7 @@ CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_Element eElement, uint32_t dwPacket) { void* pValue; if (XFA_GetAttributeDefaultValue(pValue, eElement, eAttribute, - XFA_ATTRIBUTETYPE_Measure, dwPacket)) { + XFA_AttributeType::Measure, dwPacket)) { return *(CXFA_Measurement*)pValue; } return CXFA_Measurement(); @@ -407,7 +407,7 @@ CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_Element eElement, bool XFA_GetAttributeDefaultValue(void*& pValue, XFA_Element eElement, XFA_Attribute eAttribute, - XFA_ATTRIBUTETYPE eType, + XFA_AttributeType eType, uint32_t dwPacket) { const XFA_ATTRIBUTEINFO* pInfo = XFA_GetAttributeByID(eAttribute); if (!pInfo) @@ -418,7 +418,7 @@ bool XFA_GetAttributeDefaultValue(void*& pValue, pValue = pInfo->pDefValue; return true; } - if (pInfo->eType == XFA_ATTRIBUTETYPE_NOTSURE) { + if (pInfo->eType == XFA_AttributeType::NotSure) { const XFA_NOTSUREATTRIBUTE* pAttr = XFA_GetNotsureAttribute(eElement, eAttribute, eType); if (pAttr) { |