Merge to XFA: Cleanup after syncing CPDFSDK_BAAnnot

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 50 matching lines @@
     uint8_t hour;
     uint8_t minute;
     uint8_t second;
     int8_t tzHour;
     uint8_t tzMinute;
   } dt;
 };
 
 class CPDFSDK_Annot {
  public:
-  CPDFSDK_Annot(CPDFSDK_PageView* pPageView);
-  virtual ~CPDFSDK_Annot(){};
+  explicit CPDFSDK_Annot(CPDFSDK_PageView* pPageView);
+  virtual ~CPDFSDK_Annot() {}
 
   virtual FX_BOOL IsXFAField() { return FALSE; }
 
   virtual FX_FLOAT GetMinWidth() const;
   virtual FX_FLOAT GetMinHeight() const;
   // define layout order to 5.
   virtual int GetLayoutOrder() const { return 5; }
 
   virtual CPDF_Annot* GetPDFAnnot() const { return nullptr; }
   virtual IXFA_Widget* GetXFAWidget() const { return nullptr; }
@@ skipping 16 matching lines @@
 
   // Tab Order
   int GetTabOrder();
   void SetTabOrder(int iTabOrder);
 
   // Selection
   FX_BOOL IsSelected();
   void SetSelected(FX_BOOL bSelected);
 
  protected:
-  CPDF_Annot* m_pAnnot;
   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();
+  virtual ~CPDFSDK_BAAnnot() {}
 
- public:
   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);
 
- public:
   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);
   FX_SYSTEMTIME GetModifiedDate() const;
@@ skipping 37 matching lines @@
   CPDF_Action GetAction() const;
   void SetAction(const CPDF_Action& a);
   void RemoveAction();
 
   CPDF_AAction GetAAction() const;
   void SetAAction(const CPDF_AAction& aa);
   void RemoveAAction();
 
   virtual CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT);
 
- public:
   virtual FX_BOOL IsAppearanceValid();
   virtual FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode);
   virtual void DrawAppearance(CFX_RenderDevice* pDevice,
                               const CPDF_Matrix* pUser2Device,
                               CPDF_Annot::AppearanceMode mode,
                               const CPDF_RenderOptions* pOptions);
   void DrawBorder(CFX_RenderDevice* pDevice,
                   const CPDF_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
 
   void ClearCachedAP();
 
   void WriteAppearance(const CFX_ByteString& sAPType,
                        const CPDF_Rect& rcBBox,
                        const CPDF_Matrix& matrix,
                        const CFX_ByteString& sContents,
                        const CFX_ByteString& sAPState = "");
 
+ protected:
+  CPDF_Annot* m_pAnnot;
+
  private:
   FX_BOOL CreateFormFiller();
-
- protected:
-  CPDF_Annot* m_pAnnot;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEANNOT_H_