diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-12-08 12:37:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-12-08 12:37:53 -0800 |
| commit | 53ed03d9d865c312fdaa4434b83ed60619881226 (patch) | |
| tree | a5afab7a61a2342c7ba38c7c24a4a0301f540c6e | |
| parent | 80c40de632cc089979dfd5bea351f58aa20930ce (diff) | |
| download | pdfium-53ed03d9d865c312fdaa4434b83ed60619881226.tar.xz | |
Remove unused list data pointer
The list item data pointer was never assigned. Removed pointer and referencing
code.
Review-Url: https://codereview.chromium.org/2563693003
| -rw-r--r-- | xfa/fwl/cfwl_combobox.cpp | 8 | ||||
| -rw-r--r-- | xfa/fwl/cfwl_listbox.cpp | 4 | ||||
| -rw-r--r-- | xfa/fwl/cfwl_listbox.h | 1 | ||||
| -rw-r--r-- | xfa/fwl/cfwl_listitem.cpp | 1 | ||||
| -rw-r--r-- | xfa/fwl/cfwl_listitem.h | 1 |
5 files changed, 0 insertions, 15 deletions
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp index 90366979f4..83c3d4a1d9 100644 --- a/xfa/fwl/cfwl_combobox.cpp +++ b/xfa/fwl/cfwl_combobox.cpp @@ -162,14 +162,6 @@ void CFWL_ComboBox::DrawWidget(CFX_Graphics* pGraphics, param.m_matrix.Concat(*pMatrix); param.m_rtPart = rtTextBk; - if (m_iCurSel >= 0) { - if (void* p = m_pListBox->GetItemData( - m_pListBox.get(), - m_pListBox->GetItem(m_pListBox.get(), m_iCurSel))) { - param.m_pData = p; - } - } - if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) { param.m_dwStates = CFWL_PartState_Disabled; } else if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) && diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp index 30c160a248..c126e5afb5 100644 --- a/xfa/fwl/cfwl_listbox.cpp +++ b/xfa/fwl/cfwl_listbox.cpp @@ -1040,10 +1040,6 @@ void CFWL_ListBox::GetItemRect(CFWL_Widget* pWidget, rtItem = static_cast<CFWL_ListItem*>(pItem)->m_rtItem; } -void* CFWL_ListBox::GetItemData(CFWL_Widget* pWidget, CFWL_ListItem* pItem) { - return pItem ? static_cast<CFWL_ListItem*>(pItem)->m_pData : nullptr; -} - void CFWL_ListBox::SetItemStyles(CFWL_Widget* pWidget, CFWL_ListItem* pItem, uint32_t dwStyle) { diff --git a/xfa/fwl/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h index cdc3ef8933..13aab48277 100644 --- a/xfa/fwl/cfwl_listbox.h +++ b/xfa/fwl/cfwl_listbox.h @@ -65,7 +65,6 @@ class CFWL_ListBox : public CFWL_Widget { void GetItemRect(CFWL_Widget* pWidget, CFWL_ListItem* pItem, CFX_RectF& rtItem); - void* GetItemData(CFWL_Widget* pWidget, CFWL_ListItem* pItem); void SetItemStyles(CFWL_Widget* pWidget, CFWL_ListItem* pItem, uint32_t dwStyle); diff --git a/xfa/fwl/cfwl_listitem.cpp b/xfa/fwl/cfwl_listitem.cpp index c46b8a06a1..3e23b17d91 100644 --- a/xfa/fwl/cfwl_listitem.cpp +++ b/xfa/fwl/cfwl_listitem.cpp @@ -10,7 +10,6 @@ CFWL_ListItem::CFWL_ListItem() : m_dwStates(0), m_wsText(L""), m_pDIB(nullptr), - m_pData(nullptr), m_dwCheckState(0) { m_rtCheckBox.Reset(); m_rtItem.Reset(); diff --git a/xfa/fwl/cfwl_listitem.h b/xfa/fwl/cfwl_listitem.h index d4f5d6d62d..0e608f8d92 100644 --- a/xfa/fwl/cfwl_listitem.h +++ b/xfa/fwl/cfwl_listitem.h @@ -22,7 +22,6 @@ class CFWL_ListItem { uint32_t m_dwStyles; CFX_WideString m_wsText; CFX_DIBitmap* m_pDIB; - void* m_pData; uint32_t m_dwCheckState; CFX_RectF m_rtCheckBox; }; |