From 2b1a2d528469cda4e9f3e36d3c7a649e0d476480 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 14 Aug 2015 22:16:22 -0700 Subject: Merge to XFA: Use override in more classes in fpdfsdk/ R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1287193005 . (cherry picked from commit 0f6b51c0fdd14f5762bf3c7412ac59c825443cc3) Review URL: https://codereview.chromium.org/1288393004 . --- fpdfsdk/include/fsdk_baseform.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'fpdfsdk/include/fsdk_baseform.h') diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index 96617c3f00..da57430397 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -63,6 +63,7 @@ typedef struct _PDFSDK_FieldAction { FX_BOOL bFieldFull; // in FX_BOOL bRC; // in[out] } PDFSDK_FieldAction; + class CPDFSDK_Widget : public CPDFSDK_BAAnnot { public: IXFA_Widget* GetMixXFAWidget(); @@ -87,26 +88,24 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CPDF_FormField* pFormField, CPDF_FormControl* pFormControl); - public: CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm); - virtual ~CPDFSDK_Widget(); + ~CPDFSDK_Widget() override; - virtual CFX_ByteString GetSubType() const; + // CPDFSDK_Annot + CFX_ByteString GetSubType() const override; + CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override; + FX_BOOL IsAppearanceValid() override; - virtual CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT); + int GetLayoutOrder() const override { return 2; } int GetFieldType() const; - // define layout order to 2. - virtual int GetLayoutOrder() const { return 2; } - virtual FX_BOOL IsAppearanceValid(); - /* - FIELDFLAG_READONLY - FIELDFLAG_REQUIRED - FIELDFLAG_NOEXPORT - */ + // Possible values from PDF 32000-1:2008, table 221. + // FIELDFLAG_READONLY + // FIELDFLAG_REQUIRED + // FIELDFLAG_NOEXPORT int GetFieldFlags() const; int GetRotate() const; -- cgit v1.2.3