diff options
| author | weili <weili@chromium.org> | 2016-06-02 15:48:15 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-02 15:48:16 -0700 |
| commit | db444d2063df6c574882d9263e885c4fe1134133 (patch) | |
| tree | 27ce4a3f181ae0b5ad4eff6893016e7d49dfce0a /xfa/fwl/basewidget/fwl_comboboximp.cpp | |
| parent | ad700c2c1fc3c3843dae71e5982f462e42efc987 (diff) | |
| download | pdfium-db444d2063df6c574882d9263e885c4fe1134133.tar.xz | |
Fix all the code which has duplicate variable declarations
When there are duplicate variable declarations, the inner names shadow the
outter ones. This is error prone and harder to read. Remove all the
instances found by /analyze.
BUG=chromium:613623, chromium:427616
Review-Url: https://codereview.chromium.org/2027273002
Diffstat (limited to 'xfa/fwl/basewidget/fwl_comboboximp.cpp')
| -rw-r--r-- | xfa/fwl/basewidget/fwl_comboboximp.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp index 34e98fa38a..8d4ac452f7 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.cpp +++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp @@ -660,20 +660,20 @@ FWL_Error CFWL_ComboBoxImp::DrawWidget(CFX_Graphics* pGraphics, IFWL_ListItem* hItem = pData->GetItem(m_pInterface, m_iCurSel); static_cast<CFWL_ComboListImp*>(m_pListBox->GetImpl()) ->GetItemText(hItem, wsText); - CFWL_ThemeText param; - param.m_pWidget = m_pInterface; - param.m_iPart = CFWL_Part::Caption; - param.m_dwStates = m_iBtnState; - param.m_pGraphics = pGraphics; - param.m_matrix.Concat(*pMatrix); - param.m_rtPart = rtTextBk; - param.m_dwStates = (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) - ? CFWL_PartState_Selected - : CFWL_PartState_Normal; - param.m_wsText = wsText; - param.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; - param.m_iTTOAlign = FDE_TTOALIGNMENT_CenterLeft; - pTheme->DrawText(¶m); + CFWL_ThemeText theme_text; + theme_text.m_pWidget = m_pInterface; + theme_text.m_iPart = CFWL_Part::Caption; + theme_text.m_dwStates = m_iBtnState; + theme_text.m_pGraphics = pGraphics; + theme_text.m_matrix.Concat(*pMatrix); + theme_text.m_rtPart = rtTextBk; + theme_text.m_dwStates = (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) + ? CFWL_PartState_Selected + : CFWL_PartState_Normal; + theme_text.m_wsText = wsText; + theme_text.m_dwTTOStyles = FDE_TTOSTYLE_SingleLine; + theme_text.m_iTTOAlign = FDE_TTOALIGNMENT_CenterLeft; + pTheme->DrawText(&theme_text); } } { |