Cleanup: Make CPDF_Annot::m_pAnnotDict private.

fpdfsdk/src/fsdk_baseform.cpp

 // 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
 
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 21 matching lines @@
         ASSERT(m_pInterForm != NULL);
 }
 
 CPDFSDK_Widget::~CPDFSDK_Widget()
 {
 
 }
 
 FX_BOOL         CPDFSDK_Widget::IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode)
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-        
-        CPDF_Dictionary* pAP = m_pAnnot->m_pAnnotDict->GetDict("AP");
+        CPDF_Dictionary* pAP = m_pAnnot->GetAnnotDict()->GetDict("AP");
         if (pAP == NULL) return FALSE;
         
         // Choose the right sub-ap
         const FX_CHAR* ap_entry = "N";
         if (mode == CPDF_Annot::Down)
                 ap_entry = "D";
         else if (mode == CPDF_Annot::Rollover)
                 ap_entry = "R";
         if (!pAP->KeyExist(ap_entry))
                 ap_entry = "N";
@@ skipping 33 matching lines @@
         ASSERT(pField != NULL);
         
         return pField->GetFieldType();
 }
 
 int CPDFSDK_Widget::GetFieldFlags() const
 {
         CPDF_InterForm* pPDFInterForm = m_pInterForm->GetInterForm();
         ASSERT(pPDFInterForm != NULL);
 
-        CPDF_FormControl* pFormControl = pPDFInterForm->GetControlByDict(m_pAnnot->m_pAnnotDict);
+        CPDF_FormControl* pFormControl = pPDFInterForm->GetControlByDict(m_pAnnot->GetAnnotDict());
         CPDF_FormField* pFormField = pFormControl->GetField();
         return pFormField->GetFieldFlags();
 }
 
 CFX_ByteString CPDFSDK_Widget::GetSubType() const
 {
         int nType = GetFieldType();
         
         if (nType == FIELDTYPE_SIGNATURE)
                 return BFFT_SIGNATURE;
@@ skipping 1421 matching lines @@
         if (iColorType > 0)
                 crFill = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         return crFill;
 }
 
 void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Stream* pImage)
 {
         ASSERT(pImage != NULL);
 
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-
         CPDF_Document* pDoc = m_pPageView->GetPDFDocument();//pDocument->GetDocument();
         ASSERT(pDoc != NULL);
 
-        CPDF_Dictionary* pAPDict = m_pAnnot->m_pAnnotDict->GetDict("AP");
+        CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP");
         ASSERT(pAPDict != NULL);
 
         CPDF_Stream* pStream = pAPDict->GetStream(sAPType);
         ASSERT(pStream != NULL);
 
         CPDF_Dictionary* pStreamDict = pStream->GetDict();
         ASSERT(pStreamDict != NULL);
 
         CFX_ByteString sImageAlias = "IMG";
 
@@ skipping 14 matching lines @@
         if (pStreamResList)
         {
                 CPDF_Dictionary* pXObject = new CPDF_Dictionary;
                 pXObject->SetAtReference(sImageAlias, pDoc, pImage);
                 pStreamResList->SetAt("XObject", pXObject);
         }
 }
 
 void CPDFSDK_Widget::RemoveAppearance(const CFX_ByteString& sAPType)
 {
-        ASSERT(m_pAnnot != NULL);
-        ASSERT(m_pAnnot->m_pAnnotDict != NULL);
-
-        if (CPDF_Dictionary* pAPDict = m_pAnnot->m_pAnnotDict->GetDict("AP"))
+        if (CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP"))
         {
                 pAPDict->RemoveAt(sAPType);
         }
 }
 
 FX_BOOL CPDFSDK_Widget::OnAAction(CPDF_AAction::AActionType type, PDFSDK_FieldAction& data, CPDFSDK_PageView* pPageView)
 {
         CPDF_Action action = GetAAction(type);
 
         if (action && action.GetType() != CPDF_Action::Unknown)
@@ skipping 1397 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }