Remove FX_WORD in favor of uint16_t.

core/fpdfdoc/pdf_vt.h

 // 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
 
 #ifndef CORE_FPDFDOC_PDF_VT_H_
 #define CORE_FPDFDOC_PDF_VT_H_
 
 #include "core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 97 matching lines @@
 };
 struct CPVT_WordInfo {
   CPVT_WordInfo()
       : Word(0),
         nCharset(0),
         fWordX(0.0f),
         fWordY(0.0f),
         fWordTail(0.0f),
         nFontIndex(-1),
         pWordProps(NULL) {}
-  CPVT_WordInfo(FX_WORD word,
+  CPVT_WordInfo(uint16_t word,
                 int32_t charset,
                 int32_t fontIndex,
                 CPVT_WordProps* pProps)
       : Word(word),
         nCharset(charset),
         fWordX(0.0f),
         fWordY(0.0f),
         fWordTail(0.0f),
         nFontIndex(fontIndex),
         pWordProps(pProps) {}
@@ skipping 16 matching lines @@
     nCharset = word.nCharset;
     nFontIndex = word.nFontIndex;
     if (word.pWordProps) {
       if (pWordProps) {
         *pWordProps = *word.pWordProps;
       } else {
         pWordProps = new CPVT_WordProps(*word.pWordProps);
       }
     }
   }
-  FX_WORD Word;
+  uint16_t Word;
   int32_t nCharset;
   FX_FLOAT fWordX;
   FX_FLOAT fWordY;
   FX_FLOAT fWordTail;
   int32_t nFontIndex;
   CPVT_WordProps* pWordProps;
 };
 struct CPVT_FloatRange {
   CPVT_FloatRange() : fMin(0.0f), fMax(0.0f) {}
   CPVT_FloatRange(FX_FLOAT min, FX_FLOAT max) : fMin(min), fMax(max) {}
@@ skipping 176 matching lines @@
   ~CPDF_VariableText() override;
 
   // IPDF_VariableText
   IPDF_VariableText_Provider* SetProvider(
       IPDF_VariableText_Provider* pProvider) override;
   IPDF_VariableText_Iterator* GetIterator() override;
   void SetPlateRect(const CFX_FloatRect& rect) override {
     CPDF_EditContainer::SetPlateRect(rect);
   }
   void SetAlignment(int32_t nFormat = 0) override { m_nAlignment = nFormat; }
-  void SetPasswordChar(FX_WORD wSubWord = '*') override {
+  void SetPasswordChar(uint16_t wSubWord = '*') override {
     m_wSubWord = wSubWord;
   }
   void SetLimitChar(int32_t nLimitChar = 0) override {
     m_nLimitChar = nLimitChar;
   }
   void SetCharSpace(FX_FLOAT fCharSpace = 0.0f) override {
     m_fCharSpace = fCharSpace;
   }
   void SetHorzScale(int32_t nHorzScale = 100) override {
     m_nHorzScale = nHorzScale;
@@ skipping 17 matching lines @@
   FX_BOOL IsValid() const override { return m_bInitial; }
   FX_BOOL IsRichText() const override { return m_bRichText; }
   void RearrangeAll() override;
   void RearrangePart(const CPVT_WordRange& PlaceRange) override;
   void ResetAll() override;
   void SetText(const FX_WCHAR* text,
                int32_t charset = 1,
                const CPVT_SecProps* pSecProps = NULL,
                const CPVT_WordProps* pWordProps = NULL) override;
   CPVT_WordPlace InsertWord(const CPVT_WordPlace& place,
-                            FX_WORD word,
+                            uint16_t word,
                             int32_t charset = 1,
                             const CPVT_WordProps* pWordProps = NULL) override;
   CPVT_WordPlace InsertSection(
       const CPVT_WordPlace& place,
       const CPVT_SecProps* pSecProps = NULL,
       const CPVT_WordProps* pWordProps = NULL) override;
   CPVT_WordPlace InsertText(const CPVT_WordPlace& place,
                             const FX_WCHAR* text,
                             int32_t charset = 1,
                             const CPVT_SecProps* pSecProps = NULL,
                             const CPVT_WordProps* pWordProps = NULL) override;
   CPVT_WordPlace DeleteWords(const CPVT_WordRange& PlaceRange) override;
   CPVT_WordPlace DeleteWord(const CPVT_WordPlace& place) override;
   CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place) override;
   const CFX_FloatRect& GetPlateRect() const override {
     return CPDF_EditContainer::GetPlateRect();
   }
   CFX_FloatRect GetContentRect() const override;
   int32_t GetTotalWords() const override;
   FX_FLOAT GetFontSize() const override { return m_fFontSize; }
   int32_t GetAlignment() const override { return m_nAlignment; }
-  FX_WORD GetPasswordChar() const override { return GetSubWord(); }
+  uint16_t GetPasswordChar() const override { return GetSubWord(); }
   int32_t GetCharArray() const override { return m_nCharArray; }
   int32_t GetLimitChar() const override { return m_nLimitChar; }
   FX_BOOL IsMultiLine() const override { return m_bMultiLine; }
   int32_t GetHorzScale() const override { return m_nHorzScale; }
   FX_FLOAT GetCharSpace() const override { return m_fCharSpace; }
   CPVT_WordPlace GetBeginWordPlace() const override;
   CPVT_WordPlace GetEndWordPlace() const override;
   CPVT_WordPlace GetPrevWordPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetNextWordPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const override;
   CPVT_WordPlace GetUpWordPlace(const CPVT_WordPlace& place,
                                 const CFX_FloatPoint& point) const override;
   CPVT_WordPlace GetDownWordPlace(const CPVT_WordPlace& place,
                                   const CFX_FloatPoint& point) const override;
   CPVT_WordPlace GetLineBeginPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetLineEndPlace(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetSectionBeginPlace(
       const CPVT_WordPlace& place) const override;
   CPVT_WordPlace GetSectionEndPlace(const CPVT_WordPlace& place) const override;
   void UpdateWordPlace(CPVT_WordPlace& place) const override;
   CPVT_WordPlace AdjustLineHeader(const CPVT_WordPlace& place,
                                   FX_BOOL bPrevOrNext) const override;
   int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace WordIndexToWordPlace(int32_t index) const override;
 
-  FX_WORD GetSubWord() const { return m_wSubWord; }
+  uint16_t GetSubWord() const { return m_wSubWord; }
 
  private:
   int32_t GetCharWidth(int32_t nFontIndex,
-                       FX_WORD Word,
-                       FX_WORD SubWord,
+                       uint16_t Word,
+                       uint16_t SubWord,
                        int32_t nWordStyle);
   int32_t GetTypeAscent(int32_t nFontIndex);
   int32_t GetTypeDescent(int32_t nFontIndex);
-  int32_t GetWordFontIndex(FX_WORD word, int32_t charset, int32_t nFontIndex);
+  int32_t GetWordFontIndex(uint16_t word, int32_t charset, int32_t nFontIndex);
   int32_t GetDefaultFontIndex();
-  FX_BOOL IsLatinWord(FX_WORD word);
+  FX_BOOL IsLatinWord(uint16_t word);
 
   CPVT_WordPlace AddSection(const CPVT_WordPlace& place,
                             const CPVT_SectionInfo& secinfo);
   CPVT_WordPlace AddLine(const CPVT_WordPlace& place,
                          const CPVT_LineInfo& lineinfo);
   CPVT_WordPlace AddWord(const CPVT_WordPlace& place,
                          const CPVT_WordInfo& wordinfo);
   FX_BOOL GetWordInfo(const CPVT_WordPlace& place, CPVT_WordInfo& wordinfo);
   FX_BOOL SetWordInfo(const CPVT_WordPlace& place,
                       const CPVT_WordInfo& wordinfo);
   FX_BOOL GetLineInfo(const CPVT_WordPlace& place, CPVT_LineInfo& lineinfo);
   FX_BOOL GetSectionInfo(const CPVT_WordPlace& place,
                          CPVT_SectionInfo& secinfo);
   FX_FLOAT GetWordFontSize(const CPVT_WordInfo& WordInfo,
                            FX_BOOL bFactFontSize = FALSE);
   FX_FLOAT 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);
   FX_FLOAT GetWordWidth(const CPVT_WordInfo& WordInfo);
   FX_FLOAT GetWordAscent(const CPVT_WordInfo& WordInfo, FX_FLOAT fFontSize);
   FX_FLOAT GetWordDescent(const CPVT_WordInfo& WordInfo, FX_FLOAT fFontSize);
   FX_FLOAT GetWordAscent(const CPVT_WordInfo& WordInfo,
                          FX_BOOL bFactFontSize = FALSE);
@@ skipping 30 matching lines @@
   CPVT_ArrayTemplate<CSection*> m_SectionArray;
   int32_t m_nLimitChar;
   int32_t m_nCharArray;
   FX_BOOL m_bMultiLine;
   FX_BOOL m_bLimitWidth;
   FX_BOOL m_bAutoFontSize;
   int32_t m_nAlignment;
   FX_FLOAT m_fLineLeading;
   FX_FLOAT m_fCharSpace;
   int32_t m_nHorzScale;
-  FX_WORD m_wSubWord;
+  uint16_t m_wSubWord;
   FX_FLOAT m_fFontSize;
 
  private:
   FX_BOOL m_bInitial;
   FX_BOOL m_bRichText;
   IPDF_VariableText_Provider* m_pVTProvider;
   CPDF_VariableText_Iterator* m_pVTIterator;
 };
 
 class CPDF_VariableText_Iterator : public IPDF_VariableText_Iterator {
@@ skipping 16 matching lines @@
   void SetAt(int32_t nWordIndex) override;
   void SetAt(const CPVT_WordPlace& place) override;
   const CPVT_WordPlace& GetAt() const override { return m_CurPos; }
 
  private:
   CPVT_WordPlace m_CurPos;
   CPDF_VariableText* m_pVT;
 };
 
 #endif  // CORE_FPDFDOC_PDF_VT_H_