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

fpdfsdk/include/pdfwindow/PWL_FontMap.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_PDFWINDOW_PWL_FONTMAP_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_
 
 #include "../../../public/fpdf_sysfontinfo.h"
@@ skipping 33 matching lines @@
 #define THAI_CHARSET 222
 #define EASTEUROPE_CHARSET 238
 #define RUSSIAN_CHARSET 204
 #define BALTIC_CHARSET 186
 
 #endif
 
 class CPWL_FontMap : public IFX_Edit_FontMap {
  public:
   CPWL_FontMap(IFX_SystemHandler* pSystemHandler);
-  virtual ~CPWL_FontMap();
+  ~CPWL_FontMap() override;
 
-  virtual CPDF_Font* GetPDFFont(int32_t nFontIndex);
-  virtual CFX_ByteString GetPDFFontAlias(int32_t nFontIndex);
-  virtual int32_t GetWordFontIndex(FX_WORD word,
-                                   int32_t nCharset,
-                                   int32_t nFontIndex);
-  virtual int32_t CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word);
-  virtual int32_t CharSetFromUnicode(FX_WORD word, int32_t nOldCharset);
+  // IFX_Edit_FontMap
+  CPDF_Font* GetPDFFont(int32_t nFontIndex) override;
+  CFX_ByteString GetPDFFontAlias(int32_t nFontIndex) override;
+  int32_t GetWordFontIndex(FX_WORD word,
+                           int32_t nCharset,
+                           int32_t nFontIndex) override;
+  int32_t CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word) override;
+  int32_t CharSetFromUnicode(FX_WORD word, int32_t nOldCharset) override;
 
- public:
-  virtual void Initial(const FX_CHAR* fontname = NULL);
   void SetSystemHandler(IFX_SystemHandler* pSystemHandler);
-
   int32_t GetFontMapCount() const;
   const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const;
-
- public:
   static int32_t GetNativeCharset();
   CFX_ByteString GetNativeFontName(int32_t nCharset);
 
   static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset);
 
   CPDF_Font* AddFontToDocument(CPDF_Document* pDoc,
                                CFX_ByteString& sFontName,
                                uint8_t nCharset);
   static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName);
   CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName);
   CPDF_Font* AddSystemFont(CPDF_Document* pDoc,
                            CFX_ByteString& sFontName,
                            uint8_t nCharset);
 
  protected:
-  virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
-                                         int32_t nCharset);
-  virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
+  void Initial(const FX_CHAR* fontname = NULL);
+  CPDF_Document* GetDocument();
+  CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, int32_t nCharset);
+  void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
+
   FX_BOOL KnowWord(int32_t nFontIndex, FX_WORD word);
 
-  virtual CPDF_Document* GetDocument();
-
   void Empty();
   int32_t GetFontIndex(const CFX_ByteString& sFontName,
                        int32_t nCharset,
                        FX_BOOL bFind);
   int32_t GetPWLFontIndex(FX_WORD word, int32_t nCharset);
   int32_t AddFontData(CPDF_Font* pFont,
                       const CFX_ByteString& sFontAlias,
                       int32_t nCharset = DEFAULT_CHARSET);
 
   CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName,
@@ skipping 17 matching lines @@
 
  private:
   CPDF_Document* m_pPDFDoc;
   IFX_SystemHandler* m_pSystemHandler;
 };
 
 class CPWL_DocFontMap : public CPWL_FontMap {
  public:
   CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler,
                   CPDF_Document* pAttachedDoc);
-  virtual ~CPWL_DocFontMap();
+  ~CPWL_DocFontMap() override;
 
   virtual CPDF_Document* GetDocument();
 
  private:
   CPDF_Document* m_pAttachedDoc;
 };
 
 #endif  // FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_