diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-10-12 11:56:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-10-12 11:56:23 -0700 |
| commit | 7cbe68e34257b460bfa3baf0ea68fd6d50e1bc77 (patch) | |
| tree | cc439488801d7a3e72a56ecd88df600e12b8a948 /fpdfsdk/cpdfsdk_widgethandler.cpp | |
| parent | 7cc6a32693a07210e036a8d7131232231ec0fdb3 (diff) | |
| download | pdfium-7cbe68e34257b460bfa3baf0ea68fd6d50e1bc77.tar.xz | |
Merge CPDFSDK_Document into CPDFSDK_FormFillEnvironment
This CL merges the CPDFSDK_Document and CPDFSDK_FormFillEnvironment classes
as they always existed and always pointed at each other.
Review-Url: https://codereview.chromium.org/2410893002
Diffstat (limited to 'fpdfsdk/cpdfsdk_widgethandler.cpp')
| -rw-r--r-- | fpdfsdk/cpdfsdk_widgethandler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp index 2509eb6285..a75e6c7c49 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.cpp +++ b/fpdfsdk/cpdfsdk_widgethandler.cpp @@ -13,7 +13,6 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_interform.h" #include "fpdfsdk/cpdfsdk_annot.h" -#include "fpdfsdk/cpdfsdk_document.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" @@ -54,7 +53,7 @@ FX_BOOL CPDFSDK_WidgetHandler::CanAnswer(CPDFSDK_Annot* pAnnot) { CPDFSDK_Annot* CPDFSDK_WidgetHandler::NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage) { - CPDFSDK_InterForm* pInterForm = m_pEnv->GetSDKDocument()->GetInterForm(); + CPDFSDK_InterForm* pInterForm = m_pEnv->GetInterForm(); CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl( pInterForm->GetInterForm(), pAnnot->GetAnnotDict()); if (!pCtrl) @@ -239,8 +238,7 @@ void CPDFSDK_WidgetHandler::OnLoad(CPDFSDK_Annot* pAnnot) { #ifdef PDF_ENABLE_XFA CPDFSDK_PageView* pPageView = pAnnot->GetPageView(); - CPDFXFA_Document* pDoc = - pPageView->GetFormFillEnv()->GetSDKDocument()->GetXFADocument(); + CPDFXFA_Document* pDoc = pPageView->GetFormFillEnv()->GetXFADocument(); if (pDoc->GetDocType() == DOCTYPE_STATIC_XFA) { if (!pWidget->IsAppearanceValid() && !pWidget->GetValue().IsEmpty()) pWidget->ResetAppearance(FALSE); |