Cleanup: Make CPDF_Annot::m_pAnnotDict private.
[pdfium.git] / fpdfsdk / src / fsdk_baseform.cpp
index 0cbc4ba..8b0738a 100644 (file)
@@ -39,10 +39,7 @@ 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
@@ -96,7 +93,7 @@ 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();
 }
@@ -1538,13 +1535,10 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_St
 {
        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);
@@ -1579,10 +1573,7 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_St
 
 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);
        }