diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-21 15:00:20 -0700 |
| commit | 62a70f90c49cf7714c960186eb063ad55333e6f3 (patch) | |
| tree | 84b5d0f70b770e6a9ec261342d46638f4d5102bd /xfa/fxfa/parser/xfa_localemgr.cpp | |
| parent | 4161c5ca6c5438476bf07b6dacfafb61ea611cc5 (diff) | |
| download | pdfium-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/fxfa/parser/xfa_localemgr.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_localemgr.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp index c3ec203fa0..05706d4eb2 100644 --- a/xfa/fxfa/parser/xfa_localemgr.cpp +++ b/xfa/fxfa/parser/xfa_localemgr.cpp @@ -1060,8 +1060,8 @@ static IFX_Locale* XFA_GetLocaleFromBuffer(const uint8_t* pBuf, int nBufLen) { } return NULL; } -static FX_WORD XFA_GetLanguage(CFX_WideString wsLanguage) { - FX_WORD dwLangueID = XFA_LANGID_en_US; +static uint16_t XFA_GetLanguage(CFX_WideString wsLanguage) { + uint16_t dwLangueID = XFA_LANGID_en_US; if (wsLanguage.GetLength() < 2) { return dwLangueID; } @@ -1147,7 +1147,7 @@ CXFA_LocaleMgr::~CXFA_LocaleMgr() { void CXFA_LocaleMgr::Release() { delete this; } -FX_WORD CXFA_LocaleMgr::GetDefLocaleID() { +uint16_t CXFA_LocaleMgr::GetDefLocaleID() { return m_dwDeflcid; } IFX_Locale* CXFA_LocaleMgr::GetDefLocale() { @@ -1163,7 +1163,7 @@ IFX_Locale* CXFA_LocaleMgr::GetDefLocale() { m_XMLLocaleArray.Add(m_pDefLocale); return m_pDefLocale; } -IFX_Locale* CXFA_LocaleMgr::GetLocale(FX_WORD lcid) { +IFX_Locale* CXFA_LocaleMgr::GetLocale(uint16_t lcid) { IFX_Locale* pLocal = NULL; switch (lcid) { case XFA_LANGID_zh_CN: @@ -1236,7 +1236,7 @@ IFX_Locale* CXFA_LocaleMgr::GetLocaleByName( return pLocale; } } - FX_WORD dwLangueID = XFA_GetLanguage(wsLocaleName); + uint16_t dwLangueID = XFA_GetLanguage(wsLocaleName); IFX_Locale* pLocale = GetLocale(dwLangueID); if (pLocale) m_XMLLocaleArray.Add(pLocale); |