Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: xfa/fxfa/parser/xfa_localemgr.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_localemgr.h ('k') | xfa/fxfa/parser/xfa_localevalue.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_localemgr.cpp
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index c3ec203fa028975c559b075a67966da3a2e3e4de..05706d4eb2f8f6315229e5e0a45b4bf9fa2d0e78 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);
« no previous file with comments | « xfa/fxfa/parser/xfa_localemgr.h ('k') | xfa/fxfa/parser/xfa_localevalue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698