Merge to XFA: Use override in more classes in core/

core/src/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 "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 const uint8_t gFontSizeSteps[] = {4,  6,  8,   9,   10,  12,  14, 18, 20,
@@ skipping 943 matching lines @@
   ClearWords(PlaceRange);
   if (PlaceRange.BeginPos.nSecIndex != PlaceRange.EndPos.nSecIndex) {
     ClearEmptySections(PlaceRange);
     if (!bLastSecPos) {
       LinkLatterSection(PlaceRange.BeginPos);
     }
   }
   return PlaceRange.BeginPos;
 }
 CPVT_WordPlace CPDF_VariableText::DeleteWord(const CPVT_WordPlace& place) {
-  return ClearRightWord(AjustLineHeader(place, TRUE));
+  return ClearRightWord(AdjustLineHeader(place, TRUE));
 }
 CPVT_WordPlace CPDF_VariableText::BackSpaceWord(const CPVT_WordPlace& place) {
-  return ClearLeftWord(AjustLineHeader(place, TRUE));
+  return ClearLeftWord(AdjustLineHeader(place, TRUE));
 }
 void CPDF_VariableText::SetText(const FX_WCHAR* text,
                                 int32_t charset,
                                 const CPVT_SecProps* pSecProps,
                                 const CPVT_WordProps* pWordProps) {
   DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
   CFX_WideString swText = text;
   CPVT_WordPlace wp(0, 0, -1);
   CPVT_SectionInfo secinfo;
   if (m_bRichText) {
@@ skipping 48 matching lines @@
     nCharCount++;
   }
 }
 void CPDF_VariableText::UpdateWordPlace(CPVT_WordPlace& place) const {
   if (place.nSecIndex < 0) {
     place = GetBeginWordPlace();
   }
   if (place.nSecIndex >= m_SectionArray.GetSize()) {
     place = GetEndWordPlace();
   }
-  place = AjustLineHeader(place, TRUE);
+  place = AdjustLineHeader(place, TRUE);
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     pSection->UpdateWordPlace(place);
   }
 }
 int32_t CPDF_VariableText::WordPlaceToWordIndex(
     const CPVT_WordPlace& place) const {
   CPVT_WordPlace newplace = place;
   UpdateWordPlace(newplace);
   int32_t nIndex = 0;
   int32_t i = 0;
@@ skipping 376 matching lines @@
 }
 FX_FLOAT CPDF_VariableText::GetCharSpace(const CPVT_WordInfo& WordInfo) {
   return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->fCharSpace
                                             : m_fCharSpace;
 }
 int32_t CPDF_VariableText::GetHorzScale(const CPVT_WordInfo& WordInfo) {
   return m_bRichText && WordInfo.pWordProps ? WordInfo.pWordProps->nHorzScale
                                             : m_nHorzScale;
 }
 void CPDF_VariableText::ClearSectionRightWords(const CPVT_WordPlace& place) {
-  CPVT_WordPlace wordplace = AjustLineHeader(place, TRUE);
+  CPVT_WordPlace wordplace = AdjustLineHeader(place, TRUE);
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     for (int32_t w = pSection->m_WordArray.GetSize() - 1;
          w > wordplace.nWordIndex; w--) {
       delete pSection->m_WordArray.GetAt(w);
       pSection->m_WordArray.RemoveAt(w);
     }
   }
 }
-CPVT_WordPlace CPDF_VariableText::AjustLineHeader(const CPVT_WordPlace& place,
-                                                  FX_BOOL bPrevOrNext) const {
+CPVT_WordPlace CPDF_VariableText::AdjustLineHeader(const CPVT_WordPlace& place,
+                                                   FX_BOOL bPrevOrNext) const {
   if (place.nWordIndex < 0 && place.nLineIndex > 0) {
     return bPrevOrNext ? GetPrevWordPlace(place) : GetNextWordPlace(place);
   }
   return place;
 }
 FX_BOOL CPDF_VariableText::ClearEmptySection(const CPVT_WordPlace& place) {
   if (place.nSecIndex == 0 && m_SectionArray.GetSize() == 1) {
     return FALSE;
   }
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     if (pSection->m_WordArray.GetSize() == 0) {
       delete pSection;
       m_SectionArray.RemoveAt(place.nSecIndex);
       return TRUE;
     }
   }
   return FALSE;
 }
 void CPDF_VariableText::ClearEmptySections(const CPVT_WordRange& PlaceRange) {
   CPVT_WordPlace wordplace;
   for (int32_t s = PlaceRange.EndPos.nSecIndex;
        s > PlaceRange.BeginPos.nSecIndex; s--) {
     wordplace.nSecIndex = s;
     ClearEmptySection(wordplace);
   }
 }
 void CPDF_VariableText::LinkLatterSection(const CPVT_WordPlace& place) {
-  CPVT_WordPlace oldplace = AjustLineHeader(place, TRUE);
+  CPVT_WordPlace oldplace = AdjustLineHeader(place, TRUE);
   if (CSection* pNextSection = m_SectionArray.GetAt(place.nSecIndex + 1)) {
     if (CSection* pSection = m_SectionArray.GetAt(oldplace.nSecIndex)) {
       for (int32_t w = 0, sz = pNextSection->m_WordArray.GetSize(); w < sz;
            w++) {
         if (CPVT_WordInfo* pWord = pNextSection->m_WordArray.GetAt(w)) {
           oldplace.nWordIndex++;
           pSection->AddWord(oldplace, *pWord);
         }
       }
     }
     delete pNextSection;
     m_SectionArray.RemoveAt(place.nSecIndex + 1);
   }
 }
 void CPDF_VariableText::ClearWords(const CPVT_WordRange& PlaceRange) {
   CPVT_WordRange NewRange;
-  NewRange.BeginPos = AjustLineHeader(PlaceRange.BeginPos, TRUE);
-  NewRange.EndPos = AjustLineHeader(PlaceRange.EndPos, TRUE);
+  NewRange.BeginPos = AdjustLineHeader(PlaceRange.BeginPos, TRUE);
+  NewRange.EndPos = AdjustLineHeader(PlaceRange.EndPos, TRUE);
   for (int32_t s = NewRange.EndPos.nSecIndex; s >= NewRange.BeginPos.nSecIndex;
        s--) {
     if (CSection* pSection = m_SectionArray.GetAt(s)) {
       pSection->ClearWords(NewRange);
     }
   }
 }
 CPVT_WordPlace CPDF_VariableText::ClearLeftWord(const CPVT_WordPlace& place) {
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
     CPVT_WordPlace leftplace = GetPrevWordPlace(place);
     if (leftplace != place) {
       if (leftplace.nSecIndex != place.nSecIndex) {
         if (pSection->m_WordArray.GetSize() == 0) {
           ClearEmptySection(place);
         } else {
           LinkLatterSection(leftplace);
         }
       } else {
         pSection->ClearWord(place);
       }
     }
     return leftplace;
   }
   return place;
 }
 CPVT_WordPlace CPDF_VariableText::ClearRightWord(const CPVT_WordPlace& place) {
   if (CSection* pSection = m_SectionArray.GetAt(place.nSecIndex)) {
-    CPVT_WordPlace rightplace = AjustLineHeader(GetNextWordPlace(place), FALSE);
+    CPVT_WordPlace rightplace =
+        AdjustLineHeader(GetNextWordPlace(place), FALSE);
     if (rightplace != place) {
       if (rightplace.nSecIndex != place.nSecIndex) {
         LinkLatterSection(place);
       } else {
         pSection->ClearWord(rightplace);
       }
     }
   }
   return place;
 }
@@ skipping 293 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;
 }