3 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index d585e279ce..37d363f443 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -1310,7 +1310,7 @@ static void XFA_BOX_GetFillPath(CXFA_Box box,
                                 const CXFA_StrokeArray& strokes,
                                 CFX_RectF rtWidget,
                                 CFX_Path& fillPath,
-                                FX_WORD dwFlags) {
+                                uint16_t dwFlags) {
   if (box.IsArc() || (dwFlags & XFA_DRAWBOX_ForceRound) != 0) {
     CXFA_Edge edge = box.GetEdge(0);
     FX_FLOAT fThickness = edge.GetThickness();
diff --git a/xfa/fxfa/app/xfa_fontmgr.cpp b/xfa/fxfa/app/xfa_fontmgr.cpp
index 5fc3ce97aa..25a291f093 100644
--- a/xfa/fxfa/app/xfa_fontmgr.cpp
+++ b/xfa/fxfa/app/xfa_fontmgr.cpp
@@ -1765,7 +1765,7 @@ CXFA_DefFontMgr::~CXFA_DefFontMgr() {
 IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
                                    const CFX_WideStringC& wsFontFamily,
                                    FX_DWORD dwFontStyles,
-                                   FX_WORD wCodePage) {
+                                   uint16_t wCodePage) {
   CFX_WideString wsFontName = wsFontFamily;
   IFX_FontMgr* pFDEFontMgr =
       static_cast<CXFA_FFDoc*>(hDoc)->GetApp()->GetFDEFontMgr();
@@ -1809,7 +1809,7 @@ IFX_Font* CXFA_DefFontMgr::GetFont(IXFA_Doc* hDoc,
 IFX_Font* CXFA_DefFontMgr::GetDefaultFont(IXFA_Doc* hDoc,
                                           const CFX_WideStringC& wsFontFamily,
                                           FX_DWORD dwFontStyles,
-                                          FX_WORD wCodePage) {
+                                          uint16_t wCodePage) {
   IFX_FontMgr* pFDEFontMgr = ((CXFA_FFDoc*)hDoc)->GetApp()->GetFDEFontMgr();
   IFX_Font* pFont =
       pFDEFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage);
@@ -2021,7 +2021,7 @@ CXFA_FontMgr::~CXFA_FontMgr() {
 IFX_Font* CXFA_FontMgr::GetFont(IXFA_Doc* hDoc,
                                 const CFX_WideStringC& wsFontFamily,
                                 FX_DWORD dwFontStyles,
-                                FX_WORD wCodePage) {
+                                uint16_t wCodePage) {
   FX_DWORD dwHash = FX_HashCode_String_GetW(wsFontFamily.GetPtr(),
                                             wsFontFamily.GetLength(), FALSE);
   CFX_ByteString bsKey;
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);