Remove FX_WORD in favor of uint16_t.

fpdfsdk/fxedit/fxet_edit.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/fxedit/fxet_edit.h"
 
 #include <algorithm>
 
@@ skipping 82 matching lines @@
   ASSERT(m_pFontMap);
 }
 
 CFX_Edit_Provider::~CFX_Edit_Provider() {}
 
 IFX_Edit_FontMap* CFX_Edit_Provider::GetFontMap() {
   return m_pFontMap;
 }
 
 int32_t CFX_Edit_Provider::GetCharWidth(int32_t nFontIndex,
-                                        FX_WORD word,
+                                        uint16_t word,
                                         int32_t nWordStyle) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     FX_DWORD charcode = word;
 
     if (pPDFFont->IsUnicodeCompatible())
       charcode = pPDFFont->CharCodeFromUnicode(word);
     else
       charcode = m_pFontMap->CharCodeFromUnicode(nFontIndex, word);
 
     if (charcode != -1)
@@ skipping 10 matching lines @@
   return 0;
 }
 
 int32_t CFX_Edit_Provider::GetTypeDescent(int32_t nFontIndex) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex))
     return pPDFFont->GetTypeDescent();
 
   return 0;
 }
 
-int32_t CFX_Edit_Provider::GetWordFontIndex(FX_WORD word,
+int32_t CFX_Edit_Provider::GetWordFontIndex(uint16_t word,
                                             int32_t charset,
                                             int32_t nFontIndex) {
   return m_pFontMap->GetWordFontIndex(word, charset, nFontIndex);
 }
 
 int32_t CFX_Edit_Provider::GetDefaultFontIndex() {
   return 0;
 }
 
-FX_BOOL CFX_Edit_Provider::IsLatinWord(FX_WORD word) {
+FX_BOOL CFX_Edit_Provider::IsLatinWord(uint16_t word) {
   return FX_EDIT_ISLATINWORD(word);
 }
 
 CFX_Edit_Refresh::CFX_Edit_Refresh() {}
 
 CFX_Edit_Refresh::~CFX_Edit_Refresh() {}
 
 void CFX_Edit_Refresh::BeginRefresh() {
   m_RefreshRects.Empty();
   m_OldLineRects = m_NewLineRects;
@@ skipping 247 matching lines @@
   }
 }
 
 CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle() {
   return m_sTitle;
 }
 
 CFXEU_InsertWord::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)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_Word(word),
       m_nCharset(charset),
       m_WordProps() {
   if (pWordProps)
     m_WordProps = *pWordProps;
@@ skipping 47 matching lines @@
   if (m_pEdit) {
     m_pEdit->SelectNone();
     m_pEdit->SetCaret(m_wpNew);
     m_pEdit->Backspace(FALSE, TRUE);
   }
 }
 
 CFXEU_Backspace::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)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_Word(word),
       m_nCharset(charset),
       m_SecProps(SecProps),
       m_WordProps(WordProps) {}
@@ skipping 16 matching lines @@
       m_pEdit->InsertReturn(&m_SecProps, &m_WordProps, FALSE, TRUE);
     } else {
       m_pEdit->InsertWord(m_Word, m_nCharset, &m_WordProps, FALSE, TRUE);
     }
   }
 }
 
 CFXEU_Delete::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)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_Word(word),
       m_nCharset(charset),
       m_SecProps(SecProps),
@@ skipping 44 matching lines @@
     m_pEdit->InsertText(m_swText.c_str(), DEFAULT_CHARSET, NULL, NULL, FALSE,
                         TRUE);
     m_pEdit->SetSel(m_wrSel.BeginPos, m_wrSel.EndPos);
   }
 }
 
 CFXEU_ClearRich::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)
     : m_pEdit(pEdit),
       m_wpOld(wpOldPlace),
       m_wpNew(wpNewPlace),
       m_wrSel(wrSel),
       m_Word(word),
       m_nCharset(charset),
       m_SecProps(SecProps),
@@ skipping 233 matching lines @@
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetAlignmentV(int32_t nFormat, FX_BOOL bPaint) {
   m_nAlignment = nFormat;
   if (bPaint)
     Paint();
 }
 
-void CFX_Edit::SetPasswordChar(FX_WORD wSubWord, FX_BOOL bPaint) {
+void CFX_Edit::SetPasswordChar(uint16_t wSubWord, FX_BOOL bPaint) {
   m_pVT->SetPasswordChar(wSubWord);
   if (bPaint)
     Paint();
 }
 
 void CFX_Edit::SetLimitChar(int32_t nLimitChar, FX_BOOL bPaint) {
   m_pVT->SetLimitChar(nLimitChar);
   if (bPaint)
     Paint();
 }
@@ skipping 735 matching lines @@
   return FALSE;
 }
 
 void CFX_Edit::SetText(const FX_WCHAR* text,
                        int32_t charset,
                        const CPVT_SecProps* pSecProps,
                        const CPVT_WordProps* pWordProps) {
   SetText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
 }
 
-FX_BOOL CFX_Edit::InsertWord(FX_WORD word,
+FX_BOOL CFX_Edit::InsertWord(uint16_t word,
                              int32_t charset,
                              const CPVT_WordProps* pWordProps) {
   return InsertWord(word, charset, pWordProps, TRUE, TRUE);
 }
 
 FX_BOOL CFX_Edit::InsertReturn(const CPVT_SecProps* pSecProps,
                                const CPVT_WordProps* pWordProps) {
   return InsertReturn(pSecProps, pWordProps, TRUE, TRUE);
 }
 
@@ skipping 13 matching lines @@
                              int32_t charset,
                              const CPVT_SecProps* pSecProps,
                              const CPVT_WordProps* pWordProps) {
   return InsertText(text, charset, pSecProps, pWordProps, TRUE, TRUE);
 }
 
 FX_FLOAT CFX_Edit::GetFontSize() const {
   return m_pVT->GetFontSize();
 }
 
-FX_WORD CFX_Edit::GetPasswordChar() const {
+uint16_t CFX_Edit::GetPasswordChar() const {
   return m_pVT->GetPasswordChar();
 }
 
 int32_t CFX_Edit::GetCharArray() const {
   return m_pVT->GetCharArray();
 }
 
 CFX_FloatRect CFX_Edit::GetPlateRect() const {
   return m_pVT->GetPlateRect();
 }
@@ skipping 823 matching lines @@
                        FX_BOOL bAddUndo,
                        FX_BOOL bPaint) {
   Empty();
   DoInsertText(CPVT_WordPlace(0, 0, -1), text, charset, pSecProps, pWordProps);
   if (bPaint)
     Paint();
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnSetText(m_wpCaret, m_wpOldCaret);
 }
 
-FX_BOOL CFX_Edit::InsertWord(FX_WORD word,
+FX_BOOL CFX_Edit::InsertWord(uint16_t word,
                              int32_t charset,
                              const CPVT_WordProps* pWordProps,
                              FX_BOOL bAddUndo,
                              FX_BOOL bPaint) {
   if (IsTextOverflow())
     return FALSE;
 
   if (m_pVT->IsValid()) {
     m_pVT->UpdateWordPlace(m_wpCaret);
 
@@ skipping 484 matching lines @@
                                       const FX_WCHAR* text,
                                       int32_t charset,
                                       const CPVT_SecProps* pSecProps,
                                       const CPVT_WordProps* pWordProps) {
   CPVT_WordPlace wp = place;
 
   if (m_pVT->IsValid()) {
     CFX_WideString sText = text;
 
     for (int32_t i = 0, sz = sText.GetLength(); i < sz; i++) {
-      FX_WORD word = sText[i];
+      uint16_t word = sText[i];
       switch (word) {
         case 0x0D:
           wp = m_pVT->InsertSection(wp, pSecProps, pWordProps);
           if (sText[i + 1] == 0x0A)
             i++;
           break;
         case 0x0A:
           wp = m_pVT->InsertSection(wp, pSecProps, pWordProps);
           if (sText[i + 1] == 0x0D)
             i++;
           break;
         case 0x09:
           word = 0x20;
         default:
           wp = m_pVT->InsertWord(wp, word, GetCharSetFromUnicode(word, charset),
                                  pWordProps);
           break;
       }
     }
   }
 
   return wp;
 }
 
-int32_t CFX_Edit::GetCharSetFromUnicode(FX_WORD word, int32_t nOldCharset) {
+int32_t CFX_Edit::GetCharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
   if (IFX_Edit_FontMap* pFontMap = GetFontMap())
     return pFontMap->CharSetFromUnicode(word, nOldCharset);
   return nOldCharset;
 }
 
 void CFX_Edit::BeginGroupUndo(const CFX_WideString& sTitle) {
   ASSERT(!m_pGroupUndoItem);
 
   m_pGroupUndoItem = new CFX_Edit_GroupUndoItem(sTitle);
 }
@@ skipping 14 matching lines @@
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnAddUndo(pEditUndoItem);
   }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem) {
   m_Undo.AddItem(pUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(pUndoItem);
 }