Remove FX_WORD in favor of uint16_t.

fpdfsdk/include/fxedit/fxet_edit.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 FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 #define FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_
 
 #include "core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 269 matching lines @@
 };
 
 /* ------------------------- CFX_Edit_UndoItem derived classes
  * ---------------------------- */
 
 class CFXEU_InsertWord : public CFX_Edit_UndoItem {
  public:
   CFXEU_InsertWord(CFX_Edit* pEdit,
                    const CPVT_WordPlace& wpOldPlace,
                    const CPVT_WordPlace& wpNewPlace,
-                   FX_WORD word,
+                   uint16_t word,
                    int32_t charset,
                    const CPVT_WordProps* pWordProps);
   ~CFXEU_InsertWord() override;
 
   // CFX_Edit_UndoItem
   void Redo() override;
   void Undo() override;
 
  private:
   CFX_Edit* m_pEdit;
 
   CPVT_WordPlace m_wpOld;
   CPVT_WordPlace m_wpNew;
-  FX_WORD m_Word;
+  uint16_t m_Word;
   int32_t m_nCharset;
   CPVT_WordProps m_WordProps;
 };
 
 class CFXEU_InsertReturn : public CFX_Edit_UndoItem {
  public:
   CFXEU_InsertReturn(CFX_Edit* pEdit,
                      const CPVT_WordPlace& wpOldPlace,
                      const CPVT_WordPlace& wpNewPlace,
                      const CPVT_SecProps* pSecProps,
@@ skipping 11 matching lines @@
   CPVT_WordPlace m_wpNew;
   CPVT_SecProps m_SecProps;
   CPVT_WordProps m_WordProps;
 };
 
 class CFXEU_Backspace : public CFX_Edit_UndoItem {
  public:
   CFXEU_Backspace(CFX_Edit* pEdit,
                   const CPVT_WordPlace& wpOldPlace,
                   const CPVT_WordPlace& wpNewPlace,
-                  FX_WORD word,
+                  uint16_t word,
                   int32_t charset,
                   const CPVT_SecProps& SecProps,
                   const CPVT_WordProps& WordProps);
   ~CFXEU_Backspace() override;
 
   // CFX_Edit_UndoItem
   void Redo() override;
   void Undo() override;
 
  private:
   CFX_Edit* m_pEdit;
 
   CPVT_WordPlace m_wpOld;
   CPVT_WordPlace m_wpNew;
-  FX_WORD m_Word;
+  uint16_t m_Word;
   int32_t m_nCharset;
   CPVT_SecProps m_SecProps;
   CPVT_WordProps m_WordProps;
 };
 
 class CFXEU_Delete : public CFX_Edit_UndoItem {
  public:
   CFXEU_Delete(CFX_Edit* pEdit,
                const CPVT_WordPlace& wpOldPlace,
                const CPVT_WordPlace& wpNewPlace,
-               FX_WORD word,
+               uint16_t word,
                int32_t charset,
                const CPVT_SecProps& SecProps,
                const CPVT_WordProps& WordProps,
                FX_BOOL bSecEnd);
   ~CFXEU_Delete() override;
 
   // CFX_Edit_UndoItem
   void Redo() override;
   void Undo() override;
 
  private:
   CFX_Edit* m_pEdit;
 
   CPVT_WordPlace m_wpOld;
   CPVT_WordPlace m_wpNew;
-  FX_WORD m_Word;
+  uint16_t m_Word;
   int32_t m_nCharset;
   CPVT_SecProps m_SecProps;
   CPVT_WordProps m_WordProps;
   FX_BOOL m_bSecEnd;
 };
 
 class CFXEU_Clear : public CFX_Edit_UndoItem {
  public:
   CFXEU_Clear(CFX_Edit* pEdit,
               const CPVT_WordRange& wrSel,
@@ skipping 10 matching lines @@
   CPVT_WordRange m_wrSel;
   CFX_WideString m_swText;
 };
 
 class CFXEU_ClearRich : public CFX_Edit_UndoItem {
  public:
   CFXEU_ClearRich(CFX_Edit* pEdit,
                   const CPVT_WordPlace& wpOldPlace,
                   const CPVT_WordPlace& wpNewPlace,
                   const CPVT_WordRange& wrSel,
-                  FX_WORD word,
+                  uint16_t word,
                   int32_t charset,
                   const CPVT_SecProps& SecProps,
                   const CPVT_WordProps& WordProps);
   ~CFXEU_ClearRich() override;
 
   // CFX_Edit_UndoItem
   void Redo() override;
   void Undo() override;
 
  private:
   CFX_Edit* m_pEdit;
 
   CPVT_WordPlace m_wpOld;
   CPVT_WordPlace m_wpNew;
   CPVT_WordRange m_wrSel;
-  FX_WORD m_Word;
+  uint16_t m_Word;
   int32_t m_nCharset;
   CPVT_SecProps m_SecProps;
   CPVT_WordProps m_WordProps;
 };
 
 class CFXEU_InsertText : public CFX_Edit_UndoItem {
  public:
   CFXEU_InsertText(CFX_Edit* pEdit,
                    const CPVT_WordPlace& wpOldPlace,
                    const CPVT_WordPlace& wpNewPlace,
@@ skipping 94 matching lines @@
   void SetNotify(IFX_Edit_Notify* pNotify) override;
   void SetOprNotify(IFX_Edit_OprNotify* pOprNotify) override;
   IFX_Edit_Iterator* GetIterator() override;
   IPDF_VariableText* GetVariableText() override;
   IFX_Edit_FontMap* GetFontMap() override;
   void Initialize() override;
   void SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint = TRUE) override;
   void SetScrollPos(const CFX_FloatPoint& point) override;
   void SetAlignmentH(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
   void SetAlignmentV(int32_t nFormat = 0, FX_BOOL bPaint = TRUE) override;
-  void SetPasswordChar(FX_WORD wSubWord = '*', FX_BOOL bPaint = TRUE) override;
+  void SetPasswordChar(uint16_t wSubWord = '*', FX_BOOL bPaint = TRUE) override;
   void SetLimitChar(int32_t nLimitChar = 0, FX_BOOL bPaint = TRUE) override;
   void SetCharArray(int32_t nCharArray = 0, FX_BOOL bPaint = TRUE) override;
   void SetCharSpace(FX_FLOAT fCharSpace = 0.0f, FX_BOOL bPaint = TRUE) override;
   void SetHorzScale(int32_t nHorzScale = 100, FX_BOOL bPaint = TRUE) override;
   void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE) override;
   void SetMultiLine(FX_BOOL bMultiLine = TRUE, FX_BOOL bPaint = TRUE) override;
   void SetAutoReturn(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
   void SetAutoFontSize(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
   void SetAutoScroll(FX_BOOL bAuto = TRUE, FX_BOOL bPaint = TRUE) override;
   void SetFontSize(FX_FLOAT fFontSize, FX_BOOL bPaint = TRUE) override;
@@ skipping 23 matching lines @@
   void OnVK_UP(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_DOWN(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_LEFT(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_RIGHT(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_HOME(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void OnVK_END(FX_BOOL bShift, FX_BOOL bCtrl) override;
   void SetText(const FX_WCHAR* text,
                int32_t charset = DEFAULT_CHARSET,
                const CPVT_SecProps* pSecProps = NULL,
                const CPVT_WordProps* pWordProps = NULL) override;
-  FX_BOOL InsertWord(FX_WORD word,
+  FX_BOOL InsertWord(uint16_t word,
                      int32_t charset = DEFAULT_CHARSET,
                      const CPVT_WordProps* pWordProps = NULL) override;
   FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps = NULL,
                        const CPVT_WordProps* pWordProps = NULL) override;
   FX_BOOL Backspace() override;
   FX_BOOL Delete() override;
   FX_BOOL Clear() override;
   FX_BOOL InsertText(const FX_WCHAR* text,
                      int32_t charset = DEFAULT_CHARSET,
                      const CPVT_SecProps* pSecProps = NULL,
                      const CPVT_WordProps* pWordProps = NULL) override;
   FX_BOOL Redo() override;
   FX_BOOL Undo() override;
   int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const override;
   CPVT_WordPlace WordIndexToWordPlace(int32_t index) 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;
   CPVT_WordPlace SearchWordPlace(const CFX_FloatPoint& point) const override;
   int32_t GetCaret() const override;
   CPVT_WordPlace GetCaretWordPlace() const override;
   CFX_WideString GetSelText() const override;
   CFX_WideString GetText() const override;
   FX_FLOAT GetFontSize() const override;
-  FX_WORD GetPasswordChar() const override;
+  uint16_t GetPasswordChar() const override;
   CFX_FloatPoint GetScrollPos() const override;
   int32_t GetCharArray() const override;
   CFX_FloatRect GetPlateRect() const override;
   CFX_FloatRect GetContentRect() const override;
   CFX_WideString GetRangeText(const CPVT_WordRange& range) const override;
   int32_t GetHorzScale() const override;
   FX_FLOAT GetCharSpace() const override;
   int32_t GetTotalWords() const override;
   void SetSel(int32_t nStartChar, int32_t nEndChar) override;
   void GetSel(int32_t& nStartChar, int32_t& nEndChar) const override;
@@ skipping 17 matching lines @@
   CPVT_WordRange GetVisibleWordRange() const override;
   void AddUndoItem(IFX_Edit_UndoItem* pUndoItem) override;
 
   FX_BOOL Empty();
 
   CPVT_WordPlace DoInsertText(const CPVT_WordPlace& place,
                               const FX_WCHAR* text,
                               int32_t charset,
                               const CPVT_SecProps* pSecProps,
                               const CPVT_WordProps* pWordProps);
-  int32_t GetCharSetFromUnicode(FX_WORD word, int32_t nOldCharset);
+  int32_t GetCharSetFromUnicode(uint16_t word, int32_t nOldCharset);
 
   int32_t GetTotalLines() const;
 
  private:
   void SetSel(const CPVT_WordPlace& begin, const CPVT_WordPlace& end);
 
   void RearrangeAll();
   void RearrangePart(const CPVT_WordRange& range);
   void ScrollToCaret();
   void SetScrollInfo();
   void SetScrollPosX(FX_FLOAT fx);
   void SetScrollPosY(FX_FLOAT fy);
   void SetScrollLimit();
   void SetContentChanged();
 
   void SetText(const FX_WCHAR* text,
                int32_t charset,
                const CPVT_SecProps* pSecProps,
                const CPVT_WordProps* pWordProps,
                FX_BOOL bAddUndo,
                FX_BOOL bPaint);
-  FX_BOOL InsertWord(FX_WORD word,
+  FX_BOOL InsertWord(uint16_t word,
                      int32_t charset,
                      const CPVT_WordProps* pWordProps,
                      FX_BOOL bAddUndo,
                      FX_BOOL bPaint);
   FX_BOOL InsertReturn(const CPVT_SecProps* pSecProps,
                        const CPVT_WordProps* pWordProps,
                        FX_BOOL bAddUndo,
                        FX_BOOL bPaint);
   FX_BOOL Backspace(FX_BOOL bAddUndo, FX_BOOL bPaint);
   FX_BOOL Delete(FX_BOOL bAddUndo, FX_BOOL bPaint);
@@ skipping 110 matching lines @@
 
 class CFX_Edit_Provider : public IPDF_VariableText_Provider {
  public:
   explicit CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap);
   ~CFX_Edit_Provider() override;
 
   IFX_Edit_FontMap* GetFontMap();
 
   // IPDF_VariableText_Provider:
   int32_t GetCharWidth(int32_t nFontIndex,
-                       FX_WORD word,
+                       uint16_t word,
                        int32_t nWordStyle) override;
   int32_t GetTypeAscent(int32_t nFontIndex) override;
   int32_t GetTypeDescent(int32_t nFontIndex) override;
-  int32_t GetWordFontIndex(FX_WORD word,
+  int32_t GetWordFontIndex(uint16_t word,
                            int32_t charset,
                            int32_t nFontIndex) override;
   int32_t GetDefaultFontIndex() override;
-  FX_BOOL IsLatinWord(FX_WORD word) override;
+  FX_BOOL IsLatinWord(uint16_t word) override;
 
  private:
   IFX_Edit_FontMap* m_pFontMap;
 };
 
 #endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_EDIT_H_