Merge to XFA: Add more overrides.

fpdfsdk/include/fsdk_baseannot.h

Index: fpdfsdk/include/fsdk_baseannot.h
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h
index c54310c0b031488b3c8ca8c502c4ea419096e29c..e9a33129b0e932e3cb5d73efbb4ff5af754d91b6 100644
--- a/fpdfsdk/include/fsdk_baseannot.h
+++ b/fpdfsdk/include/fsdk_baseannot.h
@@ -114,21 +114,17 @@ class CPDFSDK_Annot {
 class CPDFSDK_BAAnnot : public CPDFSDK_Annot {
  public:
   CPDFSDK_BAAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView);
-  virtual ~CPDFSDK_BAAnnot() {}
-
-  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);
+  ~CPDFSDK_BAAnnot() override {}
+
+  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;