Remove FX_WORD in favor of uint16_t.

core/fpdfdoc/doc_vt.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 <algorithm>
 
 #include "core/fpdfdoc/pdf_vt.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
@@ skipping 392 matching lines @@
     0x10, 0x00, 0x00, 0x28, 0x0C, 0x08, 0x00, 0x00, 0x28, 0x28, 0x28, 0x28,
     0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x08, 0x08,
     0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0C, 0x00, 0x08, 0x00, 0x00,
     0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x01, 0x01, 0x01, 0x0C, 0x00, 0x08, 0x00, 0x00,
 };
 
-static bool IsLatin(FX_WORD word) {
+static bool IsLatin(uint16_t word) {
   if (word <= 0x007F)
     return !!(special_chars[word] & 0x01);
 
   return ((word >= 0x00C0 && word <= 0x00FF) ||
           (word >= 0x0100 && word <= 0x024F) ||
           (word >= 0x1E00 && word <= 0x1EFF) ||
           (word >= 0x2C60 && word <= 0x2C7F) ||
           (word >= 0xA720 && word <= 0xA7FF) ||
           (word >= 0xFF21 && word <= 0xFF3A) ||
           (word >= 0xFF41 && word <= 0xFF5A));
@@ skipping 78 matching lines @@
 static bool IsOpenStylePunctuation(FX_DWORD word) {
   if (word <= 0x007F)
     return !!(special_chars[word] & 0x04);
 
   return (word == 0x300A || word == 0x300C || word == 0x300E ||
           word == 0x3010 || word == 0x3014 || word == 0x3016 ||
           word == 0x3018 || word == 0x301A || word == 0xFF08 ||
           word == 0xFF3B || word == 0xFF5B || word == 0xFF62);
 }
 
-static bool IsCurrencySymbol(FX_WORD word) {
+static bool IsCurrencySymbol(uint16_t word) {
   return (word == 0x0024 || word == 0x0080 || word == 0x00A2 ||
           word == 0x00A3 || word == 0x00A4 || word == 0x00A5 ||
           (word >= 0x20A0 && word <= 0x20CF) || word == 0xFE69 ||
           word == 0xFF04 || word == 0xFFE0 || word == 0xFFE1 ||
           word == 0xFFE5 || word == 0xFFE6);
 }
 
-static bool IsPrefixSymbol(FX_WORD word) {
+static bool IsPrefixSymbol(uint16_t word) {
   return IsCurrencySymbol(word) || word == 0x2116;
 }
 
-static bool IsSpace(FX_WORD word) {
+static bool IsSpace(uint16_t word) {
   return word == 0x0020 || word == 0x3000;
 }
 
-static bool NeedDivision(FX_WORD prevWord, FX_WORD curWord) {
+static bool NeedDivision(uint16_t prevWord, uint16_t curWord) {
   if ((IsLatin(prevWord) || IsDigit(prevWord)) &&
       (IsLatin(curWord) || IsDigit(curWord))) {
     return false;
   }
   if (IsSpace(curWord) || IsPunctuation(curWord)) {
     return false;
   }
   if (IsConnectiveSymbol(prevWord) || IsConnectiveSymbol(curWord)) {
     return false;
   }
@@ skipping 273 matching lines @@
       pSection->ResetLinePlace();
     }
     m_bInitial = TRUE;
   }
 }
 void CPDF_VariableText::ResetAll() {
   m_bInitial = FALSE;
   ResetSectionArray();
 }
 CPVT_WordPlace CPDF_VariableText::InsertWord(const CPVT_WordPlace& place,
-                                             FX_WORD word,
+                                             uint16_t word,
                                              int32_t charset,
                                              const CPVT_WordProps* pWordProps) {
   int32_t nTotlaWords = GetTotalWords();
   if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
     return place;
   }
   if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
     return place;
   }
   CPVT_WordPlace newplace = place;
@@ skipping 56 matching lines @@
 }
 CPVT_WordPlace CPDF_VariableText::InsertText(const CPVT_WordPlace& place,
                                              const FX_WCHAR* text,
                                              int32_t charset,
                                              const CPVT_SecProps* pSecProps,
                                              const CPVT_WordProps* pProps) {
   CFX_WideString swText = text;
   CPVT_WordPlace wp = place;
   for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
     CPVT_WordPlace oldwp = wp;
-    FX_WORD word = swText.GetAt(i);
+    uint16_t word = swText.GetAt(i);
     switch (word) {
       case 0x0D:
         if (m_bMultiLine) {
           if (swText.GetAt(i + 1) == 0x0A) {
             i += 1;
           }
           wp = InsertSection(wp, pSecProps, pProps);
         }
         break;
       case 0x0A:
@@ skipping 57 matching lines @@
     pSection->m_SecInfo = secinfo;
   }
   int32_t nCharCount = 0;
   for (int32_t i = 0, sz = swText.GetLength(); i < sz; i++) {
     if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar) {
       break;
     }
     if (m_nCharArray > 0 && nCharCount >= m_nCharArray) {
       break;
     }
-    FX_WORD word = swText.GetAt(i);
+    uint16_t word = swText.GetAt(i);
     switch (word) {
       case 0x0D:
         if (m_bMultiLine) {
           if (swText.GetAt(i + 1) == 0x0A) {
             i += 1;
           }
           wp.nSecIndex++;
           wp.nLineIndex = 0;
           wp.nWordIndex = -1;
           AddSection(wp, secinfo);
@@ skipping 337 matching lines @@
                         bFactFontSize
                     ? WordInfo.pWordProps->fFontSize
                     : WordInfo.pWordProps->fFontSize * PVT_HALF)
              : GetFontSize();
 }
 int32_t CPDF_VariableText::GetWordFontIndex(const CPVT_WordInfo& WordInfo) {
   return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nFontIndex
                                             : WordInfo.nFontIndex;
 }
 FX_FLOAT CPDF_VariableText::GetWordWidth(int32_t nFontIndex,
-                                         FX_WORD Word,
-                                         FX_WORD SubWord,
+                                         uint16_t Word,
+                                         uint16_t SubWord,
                                          FX_FLOAT fCharSpace,
                                          int32_t nHorzScale,
                                          FX_FLOAT fFontSize,
                                          FX_FLOAT fWordTail,
                                          int32_t nWordStyle) {
   return (GetCharWidth(nFontIndex, Word, SubWord, nWordStyle) * fFontSize *
               PVT_FONTSCALE +
           fCharSpace) *
              nHorzScale * PVT_PERCENT +
          fWordTail;
@@ skipping 258 matching lines @@
         rcRet.top = std::min(rcSec.top, rcRet.top);
         rcRet.right = std::max(rcSec.right, rcRet.right);
         rcRet.bottom = std::max(rcSec.bottom, rcRet.bottom);
       }
       fPosY += rcSec.Height();
     }
   }
   return rcRet;
 }
 int32_t CPDF_VariableText::GetCharWidth(int32_t nFontIndex,
-                                        FX_WORD Word,
-                                        FX_WORD SubWord,
+                                        uint16_t Word,
+                                        uint16_t SubWord,
                                         int32_t nWordStyle) {
   if (!m_pVTProvider) {
     return 0;
   }
   if (SubWord > 0) {
     return m_pVTProvider->GetCharWidth(nFontIndex, SubWord, nWordStyle);
   }
   return m_pVTProvider->GetCharWidth(nFontIndex, Word, nWordStyle);
 }
 int32_t CPDF_VariableText::GetTypeAscent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeAscent(nFontIndex) : 0;
 }
 int32_t CPDF_VariableText::GetTypeDescent(int32_t nFontIndex) {
   return m_pVTProvider ? m_pVTProvider->GetTypeDescent(nFontIndex) : 0;
 }
-int32_t CPDF_VariableText::GetWordFontIndex(FX_WORD word,
+int32_t CPDF_VariableText::GetWordFontIndex(uint16_t word,
                                             int32_t charset,
                                             int32_t nFontIndex) {
   return m_pVTProvider
              ? m_pVTProvider->GetWordFontIndex(word, charset, nFontIndex)
              : -1;
 }
 int32_t CPDF_VariableText::GetDefaultFontIndex() {
   return m_pVTProvider ? m_pVTProvider->GetDefaultFontIndex() : -1;
 }
-FX_BOOL CPDF_VariableText::IsLatinWord(FX_WORD word) {
+FX_BOOL CPDF_VariableText::IsLatinWord(uint16_t word) {
   return m_pVTProvider ? m_pVTProvider->IsLatinWord(word) : FALSE;
 }
 IPDF_VariableText_Iterator* CPDF_VariableText::GetIterator() {
   if (!m_pVTIterator) {
     m_pVTIterator = new CPDF_VariableText_Iterator(this);
   }
   return m_pVTIterator;
 }
 IPDF_VariableText_Provider* CPDF_VariableText::SetProvider(
     IPDF_VariableText_Provider* pProvider) {
@@ skipping 145 matching lines @@
     if (pSection->m_SecInfo.pSecProps) {
       *pSection->m_SecInfo.pSecProps = section.SecProps;
     }
     if (pSection->m_SecInfo.pWordProps) {
       *pSection->m_SecInfo.pWordProps = section.WordProps;
     }
     return TRUE;
   }
   return FALSE;
 }