From 269ef77ccbb20db68c0b5049bb6a3a867623db64 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 8 Nov 2017 17:11:21 +0000 Subject: Fix XFA_SCRIPTATTRIBUTEINFO attribute type This CL changes XFA_SCRIPTATTRIBUTEINFO attribute field to be a XFA_ATTRIBUTE from an in32_t. This necessitated adding an XFA_ATTRIBUTE_Unknown and updating the various -1 values in the script data description. Change-Id: I837602e38b3785d7c8515830fae8dc427d449e9f Reviewed-on: https://pdfium-review.googlesource.com/18030 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/xfa_utils.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser/xfa_utils.cpp') diff --git a/xfa/fxfa/parser/xfa_utils.cpp b/xfa/fxfa/parser/xfa_utils.cpp index 2ee675013c..b9b1eb6fd6 100644 --- a/xfa/fxfa/parser/xfa_utils.cpp +++ b/xfa/fxfa/parser/xfa_utils.cpp @@ -278,7 +278,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, int32_t iMid = (iStart + iEnd) / 2; const XFA_NOTSUREATTRIBUTE* pAttr = g_XFANotsureAttributes + iMid; if (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; @@ -287,7 +287,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, if (iBefore >= 0) { pAttr = g_XFANotsureAttributes + iBefore; while (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; @@ -304,7 +304,7 @@ const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_Element eElement, if (iAfter <= g_iXFANotsureCount - 1) { pAttr = g_XFANotsureAttributes + iAfter; while (eElement == pAttr->eElement) { - if (pAttr->eAttribute == eAttribute) { + if (pAttr->attribute == eAttribute) { if (eType == XFA_ATTRIBUTETYPE_NOTSURE || eType == pAttr->eType) return pAttr; return nullptr; -- cgit v1.2.3