Remove core/include/fpdfdoc/fpdf_vt.h

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>
 
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
+#include "core/fpdfdoc/include/cpvt_section.h"
+#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/include/ipvt_fontmap.h"
 
 #define FX_EDIT_UNDO_MAXITEM 10000
 
 CFX_Edit_Iterator::CFX_Edit_Iterator(CFX_Edit* pEdit,
-                                     IPDF_VariableText::Iterator* pVTIterator)
+                                     CPDF_VariableText::Iterator* pVTIterator)
     : m_pEdit(pEdit), m_pVTIterator(pVTIterator) {}
 
 CFX_Edit_Iterator::~CFX_Edit_Iterator() {}
 
 FX_BOOL CFX_Edit_Iterator::NextWord() {
   return m_pVTIterator->NextWord();
 }
 
 FX_BOOL CFX_Edit_Iterator::NextLine() {
   return m_pVTIterator->NextLine();
@@ skipping 54 matching lines @@
 }
 
 const CPVT_WordPlace& CFX_Edit_Iterator::GetAt() const {
   return m_pVTIterator->GetAt();
 }
 
 IFX_Edit* CFX_Edit_Iterator::GetEdit() const {
   return m_pEdit;
 }
 
-CFX_Edit_Provider::CFX_Edit_Provider(IFX_Edit_FontMap* pFontMap)
-    : m_pFontMap(pFontMap) {
+CFX_Edit_Provider::CFX_Edit_Provider(IPVT_FontMap* pFontMap)
+    : CPDF_VariableText::Provider(pFontMap), m_pFontMap(pFontMap) {
   ASSERT(m_pFontMap);
 }
 
 CFX_Edit_Provider::~CFX_Edit_Provider() {}
 
-IFX_Edit_FontMap* CFX_Edit_Provider::GetFontMap() {
+IPVT_FontMap* CFX_Edit_Provider::GetFontMap() {
   return m_pFontMap;
 }
 
 int32_t CFX_Edit_Provider::GetCharWidth(int32_t nFontIndex,
                                         uint16_t word,
                                         int32_t nWordStyle) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     uint32_t charcode = word;
 
     if (pPDFFont->IsUnicodeCompatible())
@@ skipping 623 matching lines @@
     m_pEdit->SetWordProps(m_eProps, m_wpPlace, &m_OldWordProps, m_wrPlace,
                           FALSE);
     if (IsFirst()) {
       m_pEdit->SelectNone();
       m_pEdit->PaintSetProps(m_eProps, m_wrPlace);
       m_pEdit->SetSel(m_wrPlace.BeginPos, m_wrPlace.EndPos);
     }
   }
 }
 
-CFX_Edit::CFX_Edit(IPDF_VariableText* pVT)
+CFX_Edit::CFX_Edit(CPDF_VariableText* pVT)
     : m_pVT(pVT),
       m_pNotify(NULL),
       m_pOprNotify(NULL),
       m_pVTProvide(NULL),
       m_wpCaret(-1, -1, -1),
       m_wpOldCaret(-1, -1, -1),
       m_SelState(),
       m_ptScrollPos(0, 0),
       m_ptRefreshScrollPos(0, 0),
       m_bEnableScroll(FALSE),
@@ skipping 19 matching lines @@
   m_pIterator = NULL;
   ASSERT(!m_pGroupUndoItem);
 }
 
 void CFX_Edit::Initialize() {
   m_pVT->Initialize();
   SetCaret(m_pVT->GetBeginWordPlace());
   SetCaretOrigin();
 }
 
-void CFX_Edit::SetFontMap(IFX_Edit_FontMap* pFontMap) {
+void CFX_Edit::SetFontMap(IPVT_FontMap* pFontMap) {
   delete m_pVTProvide;
   m_pVT->SetProvider(m_pVTProvide = new CFX_Edit_Provider(pFontMap));
 }
 
-void CFX_Edit::SetVTProvider(IPDF_VariableText::Provider* pProvider) {
+void CFX_Edit::SetVTProvider(CPDF_VariableText::Provider* pProvider) {
   m_pVT->SetProvider(pProvider);
 }
 
 void CFX_Edit::SetNotify(IFX_Edit_Notify* pNotify) {
   m_pNotify = pNotify;
 }
 
 void CFX_Edit::SetOprNotify(IFX_Edit_OprNotify* pOprNotify) {
   m_pOprNotify = pOprNotify;
 }
 
 IFX_Edit_Iterator* CFX_Edit::GetIterator() {
   if (!m_pIterator)
     m_pIterator = new CFX_Edit_Iterator(this, m_pVT->GetIterator());
 
   return m_pIterator;
 }
 
-IPDF_VariableText* CFX_Edit::GetVariableText() {
+CPDF_VariableText* CFX_Edit::GetVariableText() {
   return m_pVT;
 }
 
-IFX_Edit_FontMap* CFX_Edit::GetFontMap() {
+IPVT_FontMap* CFX_Edit::GetFontMap() {
   if (m_pVTProvide)
     return m_pVTProvide->GetFontMap();
 
   return NULL;
 }
 
 void CFX_Edit::SetPlateRect(const CFX_FloatRect& rect, FX_BOOL bPaint) {
   m_pVT->SetPlateRect(rect);
   m_ptScrollPos = CFX_FloatPoint(rect.left, rect.top);
   if (bPaint)
@@ skipping 150 matching lines @@
 }
 
 CPVT_WordPlace CFX_Edit::GetCaretWordPlace() const {
   return m_wpCaret;
 }
 
 CFX_WideString CFX_Edit::GetText() const {
   CFX_WideString swRet;
 
   if (m_pVT->IsValid()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       FX_BOOL bRich = m_pVT->IsRichText();
 
       pIterator->SetAt(0);
 
       CPVT_Word wordinfo;
       CPVT_WordPlace oldplace = pIterator->GetAt();
       while (pIterator->NextWord()) {
         CPVT_WordPlace place = pIterator->GetAt();
 
         if (pIterator->GetWord(wordinfo)) {
@@ skipping 16 matching lines @@
 
   return swRet;
 }
 
 CFX_WideString CFX_Edit::GetRangeText(const CPVT_WordRange& range) const {
   CFX_WideString swRet;
 
   if (m_pVT->IsValid()) {
     FX_BOOL bRich = m_pVT->IsRichText();
 
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordRange wrTemp = range;
       m_pVT->UpdateWordPlace(wrTemp.BeginPos);
       m_pVT->UpdateWordPlace(wrTemp.EndPos);
       pIterator->SetAt(wrTemp.BeginPos);
 
       CPVT_Word wordinfo;
       CPVT_WordPlace oldplace = wrTemp.BeginPos;
       while (pIterator->NextWord()) {
         CPVT_WordPlace place = pIterator->GetAt();
         if (place.WordCmp(wrTemp.EndPos) > 0)
@@ skipping 24 matching lines @@
   return GetRangeText(m_SelState.ConvertToWordRange());
 }
 
 int32_t CFX_Edit::GetTotalWords() const {
   return m_pVT->GetTotalWords();
 }
 
 int32_t CFX_Edit::GetTotalLines() const {
   int32_t nLines = 0;
 
-  if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
     pIterator->SetAt(0);
     while (pIterator->NextLine())
       nLines++;
   }
 
   return nLines + 1;
 }
 
 CPVT_WordRange CFX_Edit::GetSelectWordRange() const {
   return m_SelState.ConvertToWordRange();
@@ skipping 39 matching lines @@
   WordProps.fFontSize = fFontSize;
   return SetRichTextProps(EP_FONTSIZE, NULL, &WordProps);
 }
 
 FX_BOOL CFX_Edit::SetRichTextColor(FX_COLORREF dwColor) {
   CPVT_WordProps WordProps;
   WordProps.dwWordColor = dwColor;
   return SetRichTextProps(EP_WORDCOLOR, NULL, &WordProps);
 }
 
-FX_BOOL CFX_Edit::SetRichTextScript(int32_t nScriptType) {
+FX_BOOL CFX_Edit::SetRichTextScript(CPDF_VariableText::ScriptType nScriptType) {
   CPVT_WordProps WordProps;
   WordProps.nScriptType = nScriptType;
   return SetRichTextProps(EP_SCRIPTTYPE, NULL, &WordProps);
 }
 
 FX_BOOL CFX_Edit::SetRichTextBold(FX_BOOL bBold) {
   CPVT_WordProps WordProps;
   if (bBold)
     WordProps.nWordStyle |= PVTWORD_STYLE_BOLD;
   return SetRichTextProps(EP_BOLD, NULL, &WordProps);
@@ skipping 49 matching lines @@
   SecProps.nAlignment = nAlignment;
   return SetRichTextProps(EP_ALIGNMENT, &SecProps, NULL);
 }
 
 FX_BOOL CFX_Edit::SetRichTextProps(EDIT_PROPS_E eProps,
                                    const CPVT_SecProps* pSecProps,
                                    const CPVT_WordProps* pWordProps) {
   FX_BOOL bSet = FALSE;
   FX_BOOL bSet1, bSet2;
   if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordRange wrTemp = m_SelState.ConvertToWordRange();
 
       m_pVT->UpdateWordPlace(wrTemp.BeginPos);
       m_pVT->UpdateWordPlace(wrTemp.EndPos);
       pIterator->SetAt(wrTemp.BeginPos);
 
       BeginGroupUndo(L"");
       bSet = SetSecProps(eProps, wrTemp.BeginPos, pSecProps, pWordProps, wrTemp,
                          TRUE);
 
@@ skipping 55 matching lines @@
   }
 }
 
 FX_BOOL CFX_Edit::SetSecProps(EDIT_PROPS_E eProps,
                               const CPVT_WordPlace& place,
                               const CPVT_SecProps* pSecProps,
                               const CPVT_WordProps* pWordProps,
                               const CPVT_WordRange& wr,
                               FX_BOOL bAddUndo) {
   if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       FX_BOOL bSet = FALSE;
       CPVT_Section secinfo;
       CPVT_Section OldSecinfo;
 
       CPVT_WordPlace oldplace = pIterator->GetAt();
 
       if (eProps == EP_LINELEADING || eProps == EP_LINEINDENT ||
           eProps == EP_ALIGNMENT) {
         if (pSecProps) {
           pIterator->SetAt(place);
@@ skipping 158 matching lines @@
 
   return FALSE;
 }
 
 FX_BOOL CFX_Edit::SetWordProps(EDIT_PROPS_E eProps,
                                const CPVT_WordPlace& place,
                                const CPVT_WordProps* pWordProps,
                                const CPVT_WordRange& wr,
                                FX_BOOL bAddUndo) {
   if (m_pVT->IsValid() && m_pVT->IsRichText()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       FX_BOOL bSet = FALSE;
       CPVT_Word wordinfo;
       CPVT_Word OldWordinfo;
 
       CPVT_WordPlace oldplace = pIterator->GetAt();
 
       if (pWordProps) {
         pIterator->SetAt(place);
         if (pIterator->GetWord(wordinfo)) {
           if (bAddUndo)
             OldWordinfo = wordinfo;
 
           switch (eProps) {
             case EP_FONTINDEX:
               if (wordinfo.WordProps.nFontIndex != pWordProps->nFontIndex) {
-                if (IFX_Edit_FontMap* pFontMap = GetFontMap()) {
+                if (IPVT_FontMap* pFontMap = GetFontMap()) {
                   wordinfo.WordProps.nFontIndex = pFontMap->GetWordFontIndex(
                       wordinfo.Word, wordinfo.nCharset, pWordProps->nFontIndex);
                 }
                 bSet = TRUE;
               }
               break;
             case EP_FONTSIZE:
               if (!FX_EDIT_IsFloatEqual(wordinfo.WordProps.fFontSize,
                                         pWordProps->fFontSize)) {
                 wordinfo.WordProps.fFontSize = pWordProps->fFontSize;
@@ skipping 437 matching lines @@
   }
 }
 
 void CFX_Edit::ScrollToCaret() {
   SetScrollLimit();
 
   if (m_pVT->IsValid()) {
     CFX_FloatPoint ptHead(0, 0);
     CFX_FloatPoint ptFoot(0, 0);
 
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       pIterator->SetAt(m_wpCaret);
 
       CPVT_Word word;
       CPVT_Line line;
       if (pIterator->GetWord(word)) {
         ptHead.x = word.ptWord.x + word.fWidth;
         ptHead.y = word.ptWord.y + word.fAscent;
         ptFoot.x = word.ptWord.x + word.fWidth;
         ptFoot.y = word.ptWord.y + word.fDescent;
       } else if (pIterator->GetLine(line)) {
@@ skipping 53 matching lines @@
         m_bNotifyFlag = FALSE;
       }
     }
 
     m_Refresh.EndRefresh();
   }
 }
 
 void CFX_Edit::RefreshPushLineRects(const CPVT_WordRange& wr) {
   if (m_pVT->IsValid()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordPlace wpBegin = wr.BeginPos;
       m_pVT->UpdateWordPlace(wpBegin);
       CPVT_WordPlace wpEnd = wr.EndPos;
       m_pVT->UpdateWordPlace(wpEnd);
       pIterator->SetAt(wpBegin);
 
       CPVT_Line lineinfo;
       do {
         if (!pIterator->GetLine(lineinfo))
           break;
         if (lineinfo.lineplace.LineCmp(wpEnd) > 0)
           break;
 
         CFX_FloatRect rcLine(lineinfo.ptLine.x,
                              lineinfo.ptLine.y + lineinfo.fLineDescent,
                              lineinfo.ptLine.x + lineinfo.fLineWidth,
                              lineinfo.ptLine.y + lineinfo.fLineAscent);
 
         m_Refresh.Push(CPVT_WordRange(lineinfo.lineplace, lineinfo.lineEnd),
                        VTToEdit(rcLine));
       } while (pIterator->NextLine());
     }
   }
 }
 
 void CFX_Edit::RefreshPushRandomRects(const CPVT_WordRange& wr) {
   if (m_pVT->IsValid()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       CPVT_WordRange wrTemp = wr;
 
       m_pVT->UpdateWordPlace(wrTemp.BeginPos);
       m_pVT->UpdateWordPlace(wrTemp.EndPos);
       pIterator->SetAt(wrTemp.BeginPos);
 
       CPVT_Word wordinfo;
       CPVT_Line lineinfo;
       CPVT_WordPlace place;
 
@@ skipping 22 matching lines @@
           m_Refresh.AddRefresh(VTToEdit(rcLine));
 
           pIterator->NextLine();
         }
       }
     }
   }
 }
 
 void CFX_Edit::RefreshWordRange(const CPVT_WordRange& wr) {
-  if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
     CPVT_WordRange wrTemp = wr;
 
     m_pVT->UpdateWordPlace(wrTemp.BeginPos);
     m_pVT->UpdateWordPlace(wrTemp.EndPos);
     pIterator->SetAt(wrTemp.BeginPos);
 
     CPVT_Word wordinfo;
     CPVT_Line lineinfo;
     CPVT_WordPlace place;
 
@@ skipping 44 matching lines @@
 void CFX_Edit::SetCaret(const CPVT_WordPlace& place) {
   m_wpOldCaret = m_wpCaret;
   m_wpCaret = place;
 }
 
 void CFX_Edit::SetCaretInfo() {
   if (m_bNotify && m_pNotify) {
     if (!m_bNotifyFlag) {
       CFX_FloatPoint ptHead(0.0f, 0.0f), ptFoot(0.0f, 0.0f);
 
-      if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
         pIterator->SetAt(m_wpCaret);
         CPVT_Word word;
         CPVT_Line line;
         if (pIterator->GetWord(word)) {
           ptHead.x = word.ptWord.x + word.fWidth;
           ptHead.y = word.ptWord.y + word.fAscent;
           ptFoot.x = word.ptWord.x + word.fWidth;
           ptFoot.y = word.ptWord.y + word.fDescent;
         } else if (pIterator->GetLine(line)) {
           ptHead.x = line.ptLine.x;
@@ skipping 14 matching lines @@
 }
 
 void CFX_Edit::SetCaretChange() {
   if (m_wpCaret == m_wpOldCaret)
     return;
 
   if (m_bNotify && m_pVT->IsRichText() && m_pNotify) {
     CPVT_SecProps SecProps;
     CPVT_WordProps WordProps;
 
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       pIterator->SetAt(m_wpCaret);
       CPVT_Word word;
       CPVT_Section section;
 
       if (pIterator->GetSection(section)) {
         SecProps = section.SecProps;
         WordProps = section.WordProps;
       }
 
       if (pIterator->GetWord(word)) {
@@ skipping 362 matching lines @@
 
 FX_BOOL CFX_Edit::Backspace(FX_BOOL bAddUndo, FX_BOOL bPaint) {
   if (m_pVT->IsValid()) {
     if (m_wpCaret == m_pVT->GetBeginWordPlace())
       return FALSE;
 
     CPVT_Section section;
     CPVT_Word word;
 
     if (bAddUndo) {
-      if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
         pIterator->SetAt(m_wpCaret);
         pIterator->GetSection(section);
         pIterator->GetWord(word);
       }
     }
 
     m_pVT->UpdateWordPlace(m_wpCaret);
     SetCaret(m_pVT->BackSpaceWord(m_wpCaret));
     m_SelState.Set(m_wpCaret, m_wpCaret);
 
@@ skipping 42 matching lines @@
 
 FX_BOOL CFX_Edit::Delete(FX_BOOL bAddUndo, FX_BOOL bPaint) {
   if (m_pVT->IsValid()) {
     if (m_wpCaret == m_pVT->GetEndWordPlace())
       return FALSE;
 
     CPVT_Section section;
     CPVT_Word word;
 
     if (bAddUndo) {
-      if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+      if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
         pIterator->SetAt(m_pVT->GetNextWordPlace(m_wpCaret));
         pIterator->GetSection(section);
         pIterator->GetWord(word);
       }
     }
 
     m_pVT->UpdateWordPlace(m_wpCaret);
     FX_BOOL bSecEnd = (m_wpCaret == m_pVT->GetSectionEndPlace(m_wpCaret));
 
     SetCaret(m_pVT->DeleteWord(m_wpCaret));
@@ skipping 53 matching lines @@
 
 FX_BOOL CFX_Edit::Clear(FX_BOOL bAddUndo, FX_BOOL bPaint) {
   if (m_pVT->IsValid()) {
     if (m_SelState.IsExist()) {
       CPVT_WordRange range = m_SelState.ConvertToWordRange();
 
       if (bAddUndo && m_bEnableUndo) {
         if (m_pVT->IsRichText()) {
           BeginGroupUndo(L"");
 
-          if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+          if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
             pIterator->SetAt(range.EndPos);
 
             CPVT_Word wordinfo;
             CPVT_Section secinfo;
             do {
               CPVT_WordPlace place = pIterator->GetAt();
               if (place.WordCmp(range.BeginPos) <= 0)
                 break;
 
               CPVT_WordPlace oldplace = m_pVT->GetPrevWordPlace(place);
@@ skipping 112 matching lines @@
       m_Undo.Undo();
       return TRUE;
     }
   }
 
   return FALSE;
 }
 
 void CFX_Edit::SetCaretOrigin() {
   if (m_pVT->IsValid()) {
-    if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+    if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
       pIterator->SetAt(m_wpCaret);
       CPVT_Word word;
       CPVT_Line line;
       if (pIterator->GetWord(word)) {
         m_ptCaret.x = word.ptWord.x + word.fWidth;
         m_ptCaret.y = word.ptWord.y;
       } else if (pIterator->GetLine(line)) {
         m_ptCaret.x = line.ptLine.x;
         m_ptCaret.y = line.ptLine.y;
       }
@@ skipping 92 matching lines @@
 
 void CFX_Edit::EnableNotify(FX_BOOL bNotify) {
   m_bNotify = bNotify;
 }
 
 void CFX_Edit::EnableOprNotify(FX_BOOL bNotify) {
   m_bOprNotify = bNotify;
 }
 
 FX_FLOAT CFX_Edit::GetLineTop(const CPVT_WordPlace& place) const {
-  if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
     CPVT_WordPlace wpOld = pIterator->GetAt();
 
     pIterator->SetAt(place);
     CPVT_Line line;
     pIterator->GetLine(line);
 
     pIterator->SetAt(wpOld);
 
     return line.ptLine.y + line.fLineAscent;
   }
 
   return 0.0f;
 }
 
 FX_FLOAT CFX_Edit::GetLineBottom(const CPVT_WordPlace& place) const {
-  if (IPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
+  if (CPDF_VariableText::Iterator* pIterator = m_pVT->GetIterator()) {
     CPVT_WordPlace wpOld = pIterator->GetAt();
 
     pIterator->SetAt(place);
     CPVT_Line line;
     pIterator->GetLine(line);
 
     pIterator->SetAt(wpOld);
 
     return line.ptLine.y + line.fLineDescent;
   }
@@ skipping 31 matching lines @@
                                  pWordProps);
           break;
       }
     }
   }
 
   return wp;
 }
 
 int32_t CFX_Edit::GetCharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
-  if (IFX_Edit_FontMap* pFontMap = GetFontMap())
+  if (IPVT_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 13 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);
 }