From 98963398054a20287cf6b354932ef56ddb4da48c Mon Sep 17 00:00:00 2001 From: weili Date: Tue, 7 Jun 2016 11:28:31 -0700 Subject: 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 --- xfa/fwl/basewidget/fwl_listboximp.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/basewidget') 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(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() { -- cgit v1.2.3