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/fpdfxfa/cpdfxfa_document.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/fpdfxfa/cpdfxfa_document.cpp')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_document.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp index 472779a6d4..c768b591ba 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_document.cpp @@ -7,7 +7,6 @@ #include "fpdfsdk/fpdfxfa/cpdfxfa_document.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "fpdfsdk/cpdfsdk_document.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_interform.h" #include "fpdfsdk/cpdfsdk_pageview.h" @@ -44,10 +43,10 @@ CPDFXFA_Document::~CPDFXFA_Document() { m_nLoadStatus = FXFA_LOADSTATUS_CLOSING; if (m_pFormFillEnv) { - m_pFormFillEnv->GetSDKDocument()->ClearAllFocusedAnnots(); + m_pFormFillEnv->ClearAllFocusedAnnots(); // Once we're deleted the SDKDocument will point at a bad underlying // doc so we need to reset it ... - m_pFormFillEnv->GetSDKDocument()->ResetXFADocument(); + m_pFormFillEnv->ResetXFADocument(); m_pFormFillEnv = nullptr; } @@ -202,5 +201,5 @@ void CPDFXFA_Document::RemovePage(CPDFXFA_Page* page) { void CPDFXFA_Document::ClearChangeMark() { if (m_pFormFillEnv) - m_pFormFillEnv->GetSDKDocument()->ClearChangeMark(); + m_pFormFillEnv->ClearChangeMark(); } |