summaryrefslogtreecommitdiff
path: root/xfa/include
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-03-21 15:00:20 -0700
committerTom Sepez <tsepez@chromium.org>2016-03-21 15:00:20 -0700
commit62a70f90c49cf7714c960186eb063ad55333e6f3 (patch)
tree84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/include
parent4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff)
downloadpdfium-62a70f90c49cf7714c960186eb063ad55333e6f3.tar.xz
Remove FX_WORD in favor of uint16_t.
It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 .
Diffstat (limited to 'xfa/include')
-rw-r--r--xfa/include/fwl/theme/widgettp.h6
-rw-r--r--xfa/include/fxfa/fxfa.h4
-rw-r--r--xfa/include/fxfa/fxfa_basic.h18
3 files changed, 14 insertions, 14 deletions
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index b451d4f373..1585db9ce2 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -181,10 +181,10 @@ class CFWL_FontData {
virtual ~CFWL_FontData();
FX_BOOL Equal(const CFX_WideStringC& wsFontFamily,
FX_DWORD dwFontStyles,
- FX_WORD wCodePage);
+ uint16_t wCodePage);
FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily,
FX_DWORD dwFontStyles,
- FX_WORD wCodePage);
+ uint16_t wCodePage);
IFX_Font* GetFont() const { return m_pFont; }
protected:
@@ -205,7 +205,7 @@ class CFWL_FontManager {
IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily,
FX_DWORD dwFontStyles,
- FX_WORD dwCodePage);
+ uint16_t dwCodePage);
protected:
CFWL_FontManager();
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 202d616f07..0015ae443d 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -296,11 +296,11 @@ class IXFA_FontMgr {
virtual IFX_Font* GetFont(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFontFamily,
FX_DWORD dwFontStyles,
- FX_WORD wCodePage = 0xFFFF) = 0;
+ uint16_t wCodePage = 0xFFFF) = 0;
virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc,
const CFX_WideStringC& wsFontFamily,
FX_DWORD dwFontStyles,
- FX_WORD wCodePage = 0xFFFF) = 0;
+ uint16_t wCodePage = 0xFFFF) = 0;
};
class IXFA_App {
public:
diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index dba3522dc4..5c0c5db935 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -969,20 +969,20 @@ CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement,
XFA_ATTRIBUTE eAttribute,
FX_DWORD dwPacket);
struct XFA_ELEMENTHIERARCHY {
- FX_WORD wStart;
- FX_WORD wCount;
+ uint16_t wStart;
+ uint16_t wCount;
};
struct XFA_SCRIPTHIERARCHY {
- FX_WORD wMethodStart;
- FX_WORD wMethodCount;
- FX_WORD wAttributeStart;
- FX_WORD wAttributeCount;
+ uint16_t wMethodStart;
+ uint16_t wMethodCount;
+ uint16_t wAttributeStart;
+ uint16_t wAttributeCount;
int16_t wParentIndex;
};
typedef XFA_SCRIPTHIERARCHY const* XFA_LPCSCRIPTHIERARCHY;
-const FX_WORD* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount);
+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,
@@ -993,7 +993,7 @@ const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement,
#define XFA_PROPERTYFLAG_OneOf 0x01
#define XFA_PROPERTYFLAG_DefaultOneOf 0x02
struct XFA_PROPERTY {
- FX_WORD eName;
+ uint16_t eName;
uint8_t uOccur;
uint8_t uFlags;
};
@@ -1070,7 +1070,7 @@ struct XFA_SCRIPTATTRIBUTEINFO {
const FX_WCHAR* pName;
XFA_ATTRIBUTE_CALLBACK lpfnCallback;
int32_t eAttribute;
- FX_WORD eValueType;
+ uint16_t eValueType;
};
const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName(
XFA_ELEMENT eElement,