Merge to XFA: Cleanup: Do not check pointers before deleting them, part 2.

fpdfsdk/src/formfiller/FFL_ListBox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_ListBox.h"
 //#include "../../include/formfiller/FFL_Module.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 //#include "../../include/formfiller/FFL_Undo.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
 
 
 #define FFL_DEFAULTLISTBOXFONTSIZE              12.0f
 
 
 /* ------------------------------- CFFL_ListBox ------------------------------- */
 
 CFFL_ListBox::CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget) :
         CFFL_FormFiller(pApp, pWidget),
         m_pFontMap(NULL)
 {
 }
 
 CFFL_ListBox::~CFFL_ListBox()
 {
-        if (m_pFontMap)
-        {
-                delete m_pFontMap;
-                m_pFontMap = NULL;
-        }
+    delete m_pFontMap;
 }
 
 PWL_CREATEPARAM CFFL_ListBox::GetCreateParam()
 {
         PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam();
 
         ASSERT(m_pWidget != NULL);
         FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags();
 
         if (dwFieldFlag & FIELDFLAG_MULTISELECT)
@@ skipping 248 matching lines @@
 
                         if (CommitData(pPageView, nFlag))
                         {
                                 DestroyPDFWindow(pPageView);
                                 m_bValid = FALSE;
                         }
                 }
         }
 }