From 5fd907b8266766152377a9836abfcac0161832fc Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 19 Nov 2015 22:20:59 -0800 Subject: Merge to XFA: Add more overrides. Using Chromium's clang + build options, there's more override warnings. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1453643002 . (cherry picked from commit 126ba519bdd489ec6c285d1410dcae773e8ef673) Review URL: https://codereview.chromium.org/1458373002 . --- fpdfsdk/include/fsdk_baseannot.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/include/fsdk_baseannot.h') diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index c54310c0b0..e9a33129b0 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; + 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; -- cgit v1.2.3