diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 17:26:17 -0700 |
| commit | 6d8b1c2c7b1cbada20109f70ae971a4192330bb5 (patch) | |
| tree | e755b7cb2624622cba606134493d25fb7f1ce6c8 /fpdfsdk/src/pdfwindow/PWL_ListBox.cpp | |
| parent | 9883a7da2d4f31910073c03e703d5b97a45d9254 (diff) | |
| download | pdfium-6d8b1c2c7b1cbada20109f70ae971a4192330bb5.tar.xz | |
Merge to XFA: Cleanup: Do not check pointers before deleting them.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1192743004.
(cherry picked from commit cfac954abcab7caf47d3fa3d641c553cba998271)
Review URL: https://codereview.chromium.org/1196783003.
Diffstat (limited to 'fpdfsdk/src/pdfwindow/PWL_ListBox.cpp')
| -rw-r--r-- | fpdfsdk/src/pdfwindow/PWL_ListBox.cpp | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp index 0328ee55d6..48fb409b7b 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp @@ -90,13 +90,9 @@ CPWL_ListBox::CPWL_ListBox() : CPWL_ListBox::~CPWL_ListBox() { - IFX_List::DelList(m_pList); - - if (m_pListNotify) - { - delete m_pListNotify; - m_pListNotify = NULL; - } + IFX_List::DelList(m_pList); + delete m_pListNotify; + m_pListNotify = NULL; } CFX_ByteString CPWL_ListBox::GetClassName() const @@ -108,7 +104,7 @@ void CPWL_ListBox::OnCreated() { if (m_pList) { - if (m_pListNotify) delete m_pListNotify; + delete m_pListNotify; m_pList->SetFontMap(GetFontMap()); m_pList->SetNotify(m_pListNotify = new CPWL_List_Notify(this)); @@ -123,11 +119,8 @@ void CPWL_ListBox::OnCreated() void CPWL_ListBox::OnDestroy() { - if (m_pListNotify) - { - delete m_pListNotify; - m_pListNotify = NULL; - } + delete m_pListNotify; + m_pListNotify = NULL; } void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf & sAppStream) |