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

fpdfsdk/include/fsdk_baseform.h

Index: fpdfsdk/include/fsdk_baseform.h
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index 96617c3f00fa2949a32dcee8ffb57ab2fe558799..8781cf2c950f8e8a33e75421e401a8e1ed955d73 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,25 +88,23 @@ 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; }
 
+  // Possible values from PDF 32000-1:2008, table 221.

[Lei Zhang, 2015/08/15 05:16:13]

This didn't merge correctly.

+  // FIELDFLAG_READONLY
+  // FIELDFLAG_REQUIRED
+  // FIELDFLAG_NOEXPORT
   int GetFieldType() const;
-  // define layout order to 2.
-  virtual int GetLayoutOrder() const { return 2; }
-  virtual FX_BOOL IsAppearanceValid();
-  /*
-  FIELDFLAG_READONLY
-  FIELDFLAG_REQUIRED
-  FIELDFLAG_NOEXPORT
-  */
 
   int GetFieldFlags() const;
   int GetRotate() const;