| Index: xfa/fwl/basewidget/fwl_listboximp.cpp
|
| diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| index 9b05a7fee4a4a6dfb416baac3d811505c50ca345..bb9d7bc969c81c3c9be95c650a394514a5a5d486 100644
|
| --- a/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp
|
| @@ -728,8 +728,6 @@ CFX_SizeF CFWL_ListBoxImp::CalcSize(FX_BOOL bAutoSize) {
|
| if (m_pProperties->m_pThemeProvider->IsCustomizedLayout(m_pInterface)) {
|
| IFWL_ListBoxDP* pData =
|
| static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
|
| - if (!bAutoSize) {
|
| - }
|
| int32_t iCount = pData->CountItems(m_pInterface);
|
| for (int32_t i = 0; i < iCount; i++) {
|
| FWL_HLISTITEM hItem = pData->GetItem(m_pInterface, i);
|
| @@ -743,9 +741,9 @@ CFX_SizeF CFWL_ListBoxImp::CalcSize(FX_BOOL bAutoSize) {
|
| if (!bAutoSize) {
|
| CFX_RectF rtItem;
|
| rtItem.Set(m_rtClient.left, m_rtClient.top + fs.y, r.width, r.height);
|
| - IFWL_ListBoxDP* pData =
|
| + IFWL_ListBoxDP* pBox =
|
| static_cast<IFWL_ListBoxDP*>(m_pProperties->m_pDataProvider);
|
| - pData->SetItemRect(m_pInterface, hItem, rtItem);
|
| + pBox->SetItemRect(m_pInterface, hItem, rtItem);
|
| }
|
| fs.y += r.height;
|
| if (fs.x < r.width) {
|
|
|