From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: 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 . --- xfa/fxfa/app/xfa_fontmgr.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/app/xfa_fontmgr.h') diff --git a/xfa/fxfa/app/xfa_fontmgr.h b/xfa/fxfa/app/xfa_fontmgr.h index 44360796e9..09d42931a5 100644 --- a/xfa/fxfa/app/xfa_fontmgr.h +++ b/xfa/fxfa/app/xfa_fontmgr.h @@ -20,8 +20,8 @@ struct XFA_FONTINFO { FX_DWORD dwFontNameHash; const FX_WCHAR* pPsName; const FX_WCHAR* pReplaceFont; - FX_WORD dwStyles; - FX_WORD wCodePage; + uint16_t dwStyles; + uint16_t wCodePage; }; class CXFA_DefFontMgr : public IXFA_FontMgr { @@ -33,11 +33,11 @@ class CXFA_DefFontMgr : public IXFA_FontMgr { IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, - FX_WORD wCodePage = 0xFFFF) override; + uint16_t wCodePage = 0xFFFF) override; IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, - FX_WORD wCodePage = 0xFFFF) override; + uint16_t wCodePage = 0xFFFF) override; protected: CFX_PtrArray m_CacheFonts; @@ -83,7 +83,7 @@ class CXFA_FontMgr { IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, FX_DWORD dwFontStyles, - FX_WORD wCodePage = 0xFFFF); + uint16_t wCodePage = 0xFFFF); void LoadDocFonts(IXFA_Doc* hDoc); void ReleaseDocFonts(IXFA_Doc* hDoc); -- cgit v1.2.3