diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-18 12:47:11 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-18 12:47:11 -0700 |
| commit | 2c28619de8051661c7f66f2192c6fb9ef14ee905 (patch) | |
| tree | 4bd15bf0bb72e4127403548bf2f40230bbdd352b /fpdfsdk/src/fsdk_mgr.cpp | |
| parent | 0c1bd7c6ad378ea97a2f54cb0c4761716f6d1057 (diff) | |
| download | pdfium-2c28619de8051661c7f66f2192c6fb9ef14ee905.tar.xz | |
Replace some Release() calls with virtual destructors.
Required fixing xfa-specific code.
Original Review URL: https://codereview.chromium.org/1192013002.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1176413004.
Diffstat (limited to 'fpdfsdk/src/fsdk_mgr.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_mgr.cpp | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 3eb3c9dd9b..69a9929bc3 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -316,25 +316,21 @@ CPDFSDK_Document::CPDFSDK_Document(CPDFXFA_Document* pDoc,CPDFDoc_Environment* p CPDFSDK_Document::~CPDFSDK_Document() { - FX_POSITION pos = m_pageMap.GetStartPosition(); - while(pos) - { - CPDFXFA_Page* pPage = NULL; - CPDFSDK_PageView* pPageView = NULL; - m_pageMap.GetNextAssoc(pos, pPage, pPageView); - delete pPageView; - } - m_pageMap.RemoveAll(); - if(m_pInterForm) - { - m_pInterForm->Destroy(); - m_pInterForm = NULL; - } - if(m_pOccontent) - { - delete m_pOccontent; - m_pOccontent = NULL; - } + FX_POSITION pos = m_pageMap.GetStartPosition(); + while(pos) + { + CPDFXFA_Page* pPage = NULL; + CPDFSDK_PageView* pPageView = NULL; + m_pageMap.GetNextAssoc(pos, pPage, pPageView); + delete pPageView; + } + m_pageMap.RemoveAll(); + + delete m_pInterForm; + m_pInterForm = nullptr; + + delete m_pOccontent; + m_pOccontent = nullptr; } void CPDFSDK_Document::InitPageView() |