diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-05 15:28:03 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-05 15:28:03 -0700 |
| commit | b7eb193dcec1594952cbc1dca356a40f66724159 (patch) | |
| tree | 69ddc52836f4c90b0c3b1c48a104eb43a9e3dc85 /fpdfsdk/src/fsdk_baseform.cpp | |
| parent | 9b440b4da2103096ae29dc7ece533128341ea1d5 (diff) | |
| download | pdfium-b7eb193dcec1594952cbc1dca356a40f66724159.tar.xz | |
Cleanup: Make CPDF_Annot::m_pAnnotDict private.
Remove dead code in CPDF_Annot as well.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1157773012
Diffstat (limited to 'fpdfsdk/src/fsdk_baseform.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 0cbc4baa44..8b0738a8d4 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -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); } |