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

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1292613003 .

(cherry picked from commit c2c3f7b5f0396409451a9d344f35ec1929a76e9f)

Review URL: https://codereview.chromium.org/1296043002 .

3 files changed, 17 insertions, 20 deletions

diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h
index 43452fdb47..305834e96a 100644
--- a/core/include/fpdfdoc/fpdf_ap.h
+++ b/core/include/fpdfdoc/fpdf_ap.h
@@ -51,20 +51,19 @@ struct CPVT_Color {
 class CPVT_Provider : public IPDF_VariableText_Provider {
  public:
   CPVT_Provider(IPVT_FontMap* pFontMap);
-
-  virtual ~CPVT_Provider();
-
-  int32_t GetCharWidth(int32_t nFontIndex, FX_WORD word, 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);
-
-  FX_BOOL IsLatinWord(FX_WORD word);
-
-  int32_t GetDefaultFontIndex();
+  ~CPVT_Provider() override;
+
+  // IPDF_VariableText_Provider
+  int32_t GetCharWidth(int32_t nFontIndex,
+                       FX_WORD 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 charset,
+                           int32_t nFontIndex) override;
+  FX_BOOL IsLatinWord(FX_WORD word) override;
+  int32_t GetDefaultFontIndex() override;
 
  private:
   IPVT_FontMap* m_pFontMap;
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 0d8dd3caec..eb99e9234a 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -132,14 +132,13 @@ class CPDF_OCContext : public IPDF_OCContext {
   enum UsageType { View = 0, Design, Print, Export };
 
   CPDF_OCContext(CPDF_Document* pDoc, UsageType eUsageType = View);
-
-  virtual ~CPDF_OCContext();
+  ~CPDF_OCContext() override;
 
   CPDF_Document* GetDocument() const { return m_pDocument; }
 
   UsageType GetUsageType() const { return m_eUsageType; }
 
-  FX_BOOL CheckOCGVisible(const CPDF_Dictionary* pOCGDict);
+  FX_BOOL CheckOCGVisible(const CPDF_Dictionary* pOCGDict) override;
 
   void ResetOCContext();
 
@@ -585,7 +584,6 @@ class CPDF_DefaultAppearance {
 class CPDF_InterForm : public CFX_PrivateData {
  public:
   CPDF_InterForm(CPDF_Document* pDocument, FX_BOOL bUpdateAP);
-
   ~CPDF_InterForm();
 
   static void EnableUpdateAP(FX_BOOL bUpdateAP);
diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h
index 62a6019793..141b3c6a1c 100644
--- a/core/include/fpdfdoc/fpdf_vt.h
+++ b/core/include/fpdfdoc/fpdf_vt.h
@@ -448,8 +448,8 @@ class IPDF_VariableText {
 
   virtual void UpdateWordPlace(CPVT_WordPlace& place) const = 0;
 
-  virtual CPVT_WordPlace AjustLineHeader(const CPVT_WordPlace& place,
-                                         FX_BOOL bPrevOrNext) const = 0;
+  virtual CPVT_WordPlace AdjustLineHeader(const CPVT_WordPlace& place,
+                                          FX_BOOL bPrevOrNext) const = 0;
 
   virtual int32_t WordPlaceToWordIndex(const CPVT_WordPlace& place) const = 0;