diff options
| author | tsepez <tsepez@chromium.org> | 2016-03-25 14:38:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-25 14:38:58 -0700 |
| commit | deee3d2ee201d62e7ef41e7d8378d7f52e057a9c (patch) | |
| tree | f9f64d5f24376108a697299f8574ae3a7fe3511b /xfa/include/fxfa/fxfa_basic.h | |
| parent | 736f28ab2434e2da1de66ff91b64741483ff9cba (diff) | |
| download | pdfium-deee3d2ee201d62e7ef41e7d8378d7f52e057a9c.tar.xz | |
Remove FX_DWORD from XFA, part 2
Some headers were missed in the previous CL.
Review URL: https://codereview.chromium.org/1835703002
Diffstat (limited to 'xfa/include/fxfa/fxfa_basic.h')
| -rw-r--r-- | xfa/include/fxfa/fxfa_basic.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 5c0c5db935..ff151d19ab 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -84,11 +84,11 @@ struct XFA_PACKETINFO { const FX_WCHAR* pName; XFA_XDPPACKET eName; const FX_WCHAR* pURI; - FX_DWORD eFlags; + uint32_t eFlags; }; const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName); -const XFA_PACKETINFO* XFA_GetPacketByID(FX_DWORD dwPacket); +const XFA_PACKETINFO* XFA_GetPacketByID(uint32_t dwPacket); const XFA_PACKETINFO* XFA_GetPacketByIndex(XFA_PACKET ePacket); enum XFA_ATTRIBUTEENUM { @@ -923,8 +923,8 @@ struct XFA_ELEMENTINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_ELEMENT eName; - FX_DWORD dwPackets; - FX_DWORD eObjectType; + uint32_t dwPackets; + uint32_t eObjectType; }; int32_t XFA_GetElementCount(); const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName); @@ -942,7 +942,7 @@ struct XFA_ATTRIBUTEINFO { const FX_WCHAR* pName; XFA_ATTRIBUTE eName; XFA_ATTRIBUTETYPE eType; - FX_DWORD dwPackets; + uint32_t dwPackets; void* pDefValue; }; int32_t XFA_GetAttributeCount(); @@ -952,22 +952,22 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, - FX_DWORD dwPacket); + uint32_t dwPacket); XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ELEMENTHIERARCHY { uint16_t wStart; uint16_t wCount; @@ -986,10 +986,10 @@ const uint16_t* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount); const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount); const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, - FX_DWORD dwPacket); + uint32_t dwPacket); const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); #define XFA_PROPERTYFLAG_OneOf 0x01 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02 struct XFA_PROPERTY { @@ -1001,7 +1001,7 @@ const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t& iCount); const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ATTRIBUTEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; |