Remove FX_WORD in favor of uint16_t.

fpdfsdk/pdfwindow/PWL_FontMap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
@@ skipping 61 matching lines @@
 CFX_ByteString CPWL_FontMap::GetPDFFontAlias(int32_t nFontIndex) {
   if (nFontIndex >= 0 && nFontIndex < m_aData.GetSize()) {
     if (CPWL_FontMap_Data* pData = m_aData.GetAt(nFontIndex)) {
       return pData->sFontName;
     }
   }
 
   return "";
 }
 
-FX_BOOL CPWL_FontMap::KnowWord(int32_t nFontIndex, FX_WORD word) {
+FX_BOOL CPWL_FontMap::KnowWord(int32_t nFontIndex, uint16_t word) {
   if (nFontIndex >= 0 && nFontIndex < m_aData.GetSize()) {
     if (m_aData.GetAt(nFontIndex)) {
       return CharCodeFromUnicode(nFontIndex, word) >= 0;
     }
   }
 
   return FALSE;
 }
 
-int32_t CPWL_FontMap::GetWordFontIndex(FX_WORD word,
+int32_t CPWL_FontMap::GetWordFontIndex(uint16_t word,
                                        int32_t nCharset,
                                        int32_t nFontIndex) {
   if (nFontIndex > 0) {
     if (KnowWord(nFontIndex, word))
       return nFontIndex;
   } else {
     if (const CPWL_FontMap_Data* pData = GetFontMapData(0)) {
       if (nCharset == DEFAULT_CHARSET || pData->nCharset == SYMBOL_CHARSET ||
           nCharset == pData->nCharset) {
         if (KnowWord(0, word))
           return 0;
       }
     }
   }
 
   int32_t nNewFontIndex =
       GetFontIndex(GetNativeFontName(nCharset), nCharset, TRUE);
   if (nNewFontIndex >= 0) {
     if (KnowWord(nNewFontIndex, word))
       return nNewFontIndex;
   }
   nNewFontIndex = GetFontIndex("Arial Unicode MS", DEFAULT_CHARSET, FALSE);
   if (nNewFontIndex >= 0) {
     if (KnowWord(nNewFontIndex, word))
       return nNewFontIndex;
   }
   return -1;
 }
 
-int32_t CPWL_FontMap::CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word) {
+int32_t CPWL_FontMap::CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) {
   if (CPWL_FontMap_Data* pData = m_aData.GetAt(nFontIndex)) {
     if (pData->pFont) {
       if (pData->pFont->IsUnicodeCompatible()) {
         int nCharCode = pData->pFont->CharCodeFromUnicode(word);
         pData->pFont->GlyphFromCharCode(nCharCode);
         return nCharCode;
       }
       if (word < 0xFF)
         return word;
     }
@@ skipping 79 matching lines @@
 
   if (!pFont) {
     CFX_ByteString sTemp = sFontName;
     pFont = AddFontToDocument(GetDocument(), sTemp, nCharset);
     sAlias = EncodeFontAlias(sTemp, nCharset);
   }
   AddedFont(pFont, sAlias);
   return AddFontData(pFont, sAlias, nCharset);
 }
 
-int32_t CPWL_FontMap::GetPWLFontIndex(FX_WORD word, int32_t nCharset) {
+int32_t CPWL_FontMap::GetPWLFontIndex(uint16_t word, int32_t nCharset) {
   int32_t nFind = -1;
 
   for (int32_t i = 0, sz = m_aData.GetSize(); i < sz; i++) {
     if (CPWL_FontMap_Data* pData = m_aData.GetAt(i)) {
       if (pData->nCharset == nCharset) {
         nFind = i;
         break;
       }
     }
   }
@@ skipping 194 matching lines @@
 CFX_ByteString CPWL_FontMap::GetDefaultFontByCharset(int32_t nCharset) {
   int i = 0;
   while (defaultTTFMap[i].charset != -1) {
     if (nCharset == defaultTTFMap[i].charset)
       return defaultTTFMap[i].fontname;
     ++i;
   }
   return "";
 }
 
-int32_t CPWL_FontMap::CharSetFromUnicode(FX_WORD word, int32_t nOldCharset) {
+int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
   if (m_pSystemHandler && (-1 != m_pSystemHandler->GetCharSet()))
     return m_pSystemHandler->GetCharSet();
   // to avoid CJK Font to show ASCII
   if (word < 0x7F)
     return ANSI_CHARSET;
   // follow the old charset
   if (nOldCharset != DEFAULT_CHARSET)
     return nOldCharset;
 
   // find new charset
@@ skipping 43 matching lines @@
 
 CPWL_DocFontMap::CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler,
                                  CPDF_Document* pAttachedDoc)
     : CPWL_FontMap(pSystemHandler), m_pAttachedDoc(pAttachedDoc) {}
 
 CPWL_DocFontMap::~CPWL_DocFontMap() {}
 
 CPDF_Document* CPWL_DocFontMap::GetDocument() {
   return m_pAttachedDoc;
 }