From 92549cd7502296328aecef23dab6d7fc0e847645 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 16 Nov 2016 07:32:48 -0800 Subject: Continue nit cleanup in fwl/core Review-Url: https://codereview.chromium.org/2506493003 --- xfa/fwl/core/cfwl_listbox.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'xfa/fwl/core/cfwl_listbox.cpp') diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp index c5bf881074..5b2ad5efbd 100644 --- a/xfa/fwl/core/cfwl_listbox.cpp +++ b/xfa/fwl/core/cfwl_listbox.cpp @@ -47,13 +47,9 @@ bool CFWL_ListBox::DeleteString(CFWL_ListItem* pItem) { if (nIndex < 0 || static_cast(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) - iSel = -1; - } if (iSel >= 0) { CFWL_ListItem* pSel = static_cast(GetItem(m_pIface.get(), iSel)); -- cgit v1.2.3