Continue nit cleanup in fwl/core

xfa/fwl/core/cfwl_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 "xfa/fwl/core/cfwl_listbox.h"
 
 #include <memory>
 
@@ skipping 29 matching lines @@
   pItem->m_dwStates = bSelect ? FWL_ITEMSTATE_LTB_Selected : 0;
   m_ItemArray.push_back(std::move(pItem));
   return m_ItemArray.back().get();
 }
 
 bool CFWL_ListBox::DeleteString(CFWL_ListItem* pItem) {
   int32_t nIndex = GetItemIndex(GetWidget(), pItem);
   if (nIndex < 0 || static_cast<size_t>(nIndex) >= m_ItemArray.size())
     return false;
 
-  int32_t iCount = CountItems(m_pIface.get());
   int32_t iSel = nIndex + 1;
-  if (iSel >= iCount) {
+  if (iSel >= CountItems(m_pIface.get())) {
     iSel = nIndex - 1;
     if (iSel < 0)

[npm, 2016/11/15 23:27:03]

Remove this if: unneeded.

[dsinclair, 2016/11/16 15:10:47]

Done.

       iSel = -1;
   }
   if (iSel >= 0) {
     CFWL_ListItem* pSel =
         static_cast<CFWL_ListItem*>(GetItem(m_pIface.get(), iSel));
     pSel->m_dwStates |= FWL_ITEMSTATE_LTB_Selected;
   }
   m_ItemArray.erase(m_ItemArray.begin() + nIndex);
   return true;
 }
@@ skipping 117 matching lines @@
 uint32_t CFWL_ListBox::GetItemCheckState(IFWL_Widget* pWidget,
                                          CFWL_ListItem* pItem) {
   return static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState;
 }
 
 void CFWL_ListBox::SetItemCheckState(IFWL_Widget* pWidget,
                                      CFWL_ListItem* pItem,
                                      uint32_t dwCheckState) {
   static_cast<CFWL_ListItem*>(pItem)->m_dwCheckState = dwCheckState;
 }