Merge to XFA: Add more overrides.

fpdfsdk/include/fsdk_baseannot.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_FSDK_BASEANNOT_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 96 matching lines @@
 
  protected:
   CPDFSDK_PageView* m_pPageView;
   FX_BOOL m_bSelected;
   int m_nTabOrder;
 };
 
 class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
  public:
   CPDFSDK_BAAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView);
-  virtual ~CPDFSDK_BAAnnot() {}
+  ~CPDFSDK_BAAnnot() override {}
 
-  virtual FX_BOOL IsXFAField();
-
-  virtual CFX_ByteString GetType() const;
-  virtual CFX_ByteString GetSubType() const;
-
-  virtual void SetRect(const CPDF_Rect& rect);
-  virtual CPDF_Rect GetRect() const;
-
-  virtual CPDF_Annot* GetPDFAnnot() const;
-
-  virtual void Annot_OnDraw(CFX_RenderDevice* pDevice,
-                            CPDF_Matrix* pUser2Device,
-                            CPDF_RenderOptions* pOptions);
+  FX_BOOL IsXFAField() override;

[Lei Zhang, 2015/11/20 06:20:52]

Conflict: XFA only.

+  CFX_ByteString GetType() const override;
+  CFX_ByteString GetSubType() const override;
+  void SetRect(const CPDF_Rect& rect) override;
+  CPDF_Rect GetRect() const override;
+  CPDF_Annot* GetPDFAnnot() const override;
+  void Annot_OnDraw(CFX_RenderDevice* pDevice,
+                    CPDF_Matrix* pUser2Device,
+                    CPDF_RenderOptions* pOptions) override;
 
   CPDF_Dictionary* GetAnnotDict() const;
 
   void SetContents(const CFX_WideString& sContents);
   CFX_WideString GetContents() const;
 
   void SetAnnotName(const CFX_WideString& sName);
   CFX_WideString GetAnnotName() const;
 
   void SetModifiedDate(const FX_SYSTEMTIME& st);
@@ skipping 64 matching lines @@
                        const CFX_ByteString& sAPState = "");
 
  protected:
   CPDF_Annot* m_pAnnot;
 
  private:
   FX_BOOL CreateFormFiller();
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_