diff options
Diffstat (limited to 'xfa/src/fxfa/src/parser/xfa_basic_imp.cpp')
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_basic_imp.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp index 3349d78561..848ae44b8c 100644 --- a/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_basic_imp.cpp @@ -239,10 +239,9 @@ const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement, return NULL; } const XFA_ATTRIBUTEINFO* pInfo = XFA_GetAttributeByID(eAttribute); - ASSERT(pInfo != NULL); - if (dwPacket == XFA_XDPPACKET_UNKNOWN) { + ASSERT(pInfo); + if (dwPacket == XFA_XDPPACKET_UNKNOWN) return pInfo; - } return (dwPacket & pInfo->dwPackets) ? pInfo : NULL; } const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, @@ -259,10 +258,9 @@ const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, return NULL; } const XFA_ELEMENTINFO* pInfo = XFA_GetElementByID(eChild); - ASSERT(pInfo != NULL); - if (dwPacket == XFA_XDPPACKET_UNKNOWN) { + ASSERT(pInfo); + if (dwPacket == XFA_XDPPACKET_UNKNOWN) return pInfo; - } return (dwPacket & pInfo->dwPackets) ? pInfo : NULL; } const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement, @@ -298,10 +296,9 @@ const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement, return NULL; } const XFA_ELEMENTINFO* pInfo = XFA_GetElementByID(eProperty); - ASSERT(pInfo != NULL); - if (dwPacket == XFA_XDPPACKET_UNKNOWN) { + ASSERT(pInfo); + if (dwPacket == XFA_XDPPACKET_UNKNOWN) return pProperty + iMid; - } return (dwPacket & pInfo->dwPackets) ? (pProperty + iMid) : NULL; } const XFA_NOTSUREATTRIBUTE* XFA_GetNotsureAttribute(XFA_ELEMENT eElement, |