diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-05 15:50:32 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-05 15:50:32 -0700 |
| commit | 64adf195e2c1da338567220d3bd1b45861f79ee2 (patch) | |
| tree | 4122e569026653c4dfc47d583d73024f3ee71502 /fpdfsdk/src/fsdk_annothandler.cpp | |
| parent | ca7db372a6379580c0e81a7f3b123eb91eae95b8 (diff) | |
| download | pdfium-64adf195e2c1da338567220d3bd1b45861f79ee2.tar.xz | |
Merge to XFA: Cleanup: Make CPDF_Annot::m_pAnnotDict private.
Remove dead code in CPDF_Annot as well.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1157773012
(cherry picked from commit b7eb193dcec1594952cbc1dca356a40f66724159)
Review URL: https://codereview.chromium.org/1157323005
Diffstat (limited to 'fpdfsdk/src/fsdk_annothandler.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_annothandler.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index 6b7c60d7af..302cec597b 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -109,12 +109,10 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnCreate(CPDFSDK_Annot* pAnnot) ASSERT(pAnnot != NULL); CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot(); - ASSERT(pPDFAnnot != NULL); - ASSERT(pPDFAnnot->m_pAnnotDict != 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)) { @@ -454,7 +452,7 @@ CPDFSDK_Annot* CPDFSDK_BFAnnotHandler::NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_Pag 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); |