diff options
author | Lei Zhang <thestig@chromium.org> | 2018-10-09 19:14:15 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-09 19:14:15 +0000 |
commit | c1bf9988bbe2f74d227ce071171455ae99c47dbb (patch) | |
tree | 19d6d95201a1fb04d9f2337ea13acd059b013471 /fpdfsdk/cpdfsdk_widget.cpp | |
parent | 09ee087b894679ff7bc6bc17c7e8a8410e00f8b5 (diff) | |
download | pdfium-c1bf9988bbe2f74d227ce071171455ae99c47dbb.tar.xz |
Use CPDFSDK_BAAnnot::GetAnnotDict() in more places.
Also initialize CPDFSDK_Widget members in the header.
Change-Id: I55cfad3b0393b7d8e897c6ea1b91952b9c5a68d1
Reviewed-on: https://pdfium-review.googlesource.com/c/43598
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_widget.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_widget.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp index 82776e3298..70ad592f6f 100644 --- a/fpdfsdk/cpdfsdk_widget.cpp +++ b/fpdfsdk/cpdfsdk_widget.cpp @@ -44,19 +44,9 @@ CPDFSDK_Widget::CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm) - : CPDFSDK_BAAnnot(pAnnot, pPageView), - m_pInterForm(pInterForm), - m_nAppearanceAge(0), - m_nValueAge(0) -#ifdef PDF_ENABLE_XFA - , - m_hMixXFAWidget(nullptr), - m_pWidgetHandler(nullptr) -#endif // PDF_ENABLE_XFA -{ -} + : CPDFSDK_BAAnnot(pAnnot, pPageView), m_pInterForm(pInterForm) {} -CPDFSDK_Widget::~CPDFSDK_Widget() {} +CPDFSDK_Widget::~CPDFSDK_Widget() = default; #ifdef PDF_ENABLE_XFA CXFA_FFWidget* CPDFSDK_Widget::GetMixXFAWidget() const { @@ -312,7 +302,7 @@ void CPDFSDK_Widget::Synchronize(bool bSynchronizeElse) { #endif // PDF_ENABLE_XFA bool CPDFSDK_Widget::IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode) { - CPDF_Dictionary* pAP = m_pAnnot->GetAnnotDict()->GetDictFor("AP"); + CPDF_Dictionary* pAP = GetAnnotDict()->GetDictFor("AP"); if (!pAP) return false; @@ -371,7 +361,7 @@ int CPDFSDK_Widget::GetLayoutOrder() const { int CPDFSDK_Widget::GetFieldFlags() const { CPDF_InterForm* pPDFInterForm = m_pInterForm->GetInterForm(); CPDF_FormControl* pFormControl = - pPDFInterForm->GetControlByDict(m_pAnnot->GetAnnotDict()); + pPDFInterForm->GetControlByDict(GetAnnotDict()); CPDF_FormField* pFormField = pFormControl->GetField(); return pFormField->GetFieldFlags(); } |