Cleanup: Make CPDF_Annot::m_pAnnotDict private.

fpdfsdk/src/fsdk_annothandler.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 "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/formfiller/FFL_FormFiller.h"
 #include "../include/fsdk_annothandler.h"
@@ skipping 73 matching lines @@
         {
                 delete (CPDFSDK_Annot*)pAnnot;
         }
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnCreate(CPDFSDK_Annot* pAnnot)
 {
         ASSERT(pAnnot != NULL);
         
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);

[Tom Sepez, 2015/06/05 21:15:30]

nit: these two asserts are pointless as we'll segv soon enough.

[Lei Zhang, 2015/06/05 22:25:47]

Ok, removed a whole bunch of them.

-        ASSERT(pPDFAnnot->m_pAnnotDict != NULL);
+        ASSERT(pPDFAnnot->GetAnnotDict() != NULL);
         
         CPDFSDK_DateTime curTime;
-        pPDFAnnot->m_pAnnotDict->SetAtString("M", curTime.ToPDFDateTimeString());
-        pPDFAnnot->m_pAnnotDict->SetAtNumber("F", (int)0);      
+        pPDFAnnot->GetAnnotDict()->SetAtString("M", curTime.ToPDFDateTimeString());
+        pPDFAnnot->GetAnnotDict()->SetAtNumber("F", 0);
         
         if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
         {
                 pAnnotHandler->OnCreate(pAnnot);
         }
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnLoad(CPDFSDK_Annot* pAnnot)
 {
         ASSERT(pAnnot != NULL);
@@ skipping 285 matching lines @@
 {
         ASSERT(pPage != NULL);
         pPage->GetPDFDocument();
         
         CPDFSDK_Document* pSDKDoc  = m_pApp->GetCurrentDoc();
         ASSERT(pSDKDoc);
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
         ASSERT(pInterForm != NULL);
         
         CPDFSDK_Widget* pWidget = NULL;
-        if (CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(pInterForm->GetInterForm(), pAnnot->m_pAnnotDict))
+        if (CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(pInterForm->GetInterForm(), pAnnot->GetAnnotDict()))
         {
                 pWidget = new CPDFSDK_Widget(pAnnot, pPage, pInterForm);
                 pInterForm->AddMap(pCtrl, pWidget);
                 CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
                 if(pPDFInterForm && pPDFInterForm->NeedConstructAP())
                         pWidget->ResetAppearance(NULL,FALSE);
         }
         
         return pWidget;
 }
@@ skipping 515 matching lines @@
                                 m_pIteratorAnnotList.RemoveAt(i);
                                 m_pIteratorAnnotList.InsertAt(0, pReaderAnnot);
                                 break;
                         }       
                 }
         }
 
         return TRUE;
 }