diff options
| author | weili <weili@chromium.org> | 2016-06-07 11:28:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 11:28:31 -0700 |
| commit | 98963398054a20287cf6b354932ef56ddb4da48c (patch) | |
| tree | b9a009dc12f7535e7fc798ee7e416e651272d863 /xfa | |
| parent | 4997b22f84307521a62838f874928bf56cd3423c (diff) | |
| download | pdfium-98963398054a20287cf6b354932ef56ddb4da48c.tar.xz | |
Fix more code which has shadow variables
The code has local variables that shadow struct or class member
variables. Also, when this happens, different variable names should be
used instead of namespaces.
These were discovered by /Wshadow warning flag in Clang.
Review-Url: https://codereview.chromium.org/2034253003
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fwl/basewidget/fwl_listboximp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp index 34628aa82c..7198480b41 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.cpp +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp @@ -879,19 +879,19 @@ CFX_SizeF CFWL_ListBoxImp::CalcSize(FX_BOOL bAutoSize) { void CFWL_ListBoxImp::GetItemSize(CFX_SizeF& size, IFWL_ListItem* pItem, FX_FLOAT fWidth, - FX_FLOAT m_fItemHeight, + FX_FLOAT fItemHeight, FX_BOOL bAutoSize) { if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_LTB_MultiColumn) { } else { if (!bAutoSize) { CFX_RectF rtItem; - rtItem.Set(0, size.y, fWidth, m_fItemHeight); + rtItem.Set(0, size.y, fWidth, fItemHeight); IFWL_ListBoxDP* pData = static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider); pData->SetItemRect(m_pInterface, pItem, rtItem); } size.x = fWidth; - size.y += m_fItemHeight; + size.y += fItemHeight; } } FX_FLOAT CFWL_ListBoxImp::GetMaxTextWidth() { |