3 files changed, 16 insertions, 20 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(&param);
+      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);
     }
   }
   {
diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp
index 6e2b4dee99..c6cef1c37d 100644
--- a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp
+++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp
@@ -326,10 +326,6 @@ void CFWL_DateTimeCalendarImpDelegate::OnLButtonUpEx(CFWL_MsgMouse* pMsg) {
                                iCurSel);
     pPicker->ShowMonthCalendar(FALSE);
   } else if (m_bFlag && (!rt.Contains(pMsg->m_fx, pMsg->m_fy))) {
-    IFWL_DateTimePicker* pIPicker =
-        static_cast<IFWL_DateTimePicker*>(m_pOwner->m_pOuter);
-    CFWL_DateTimePickerImp* pPicker =
-        static_cast<CFWL_DateTimePickerImp*>(pIPicker->GetImpl());
     pPicker->ShowMonthCalendar(FALSE);
   }
   m_bFlag = 0;
diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp
index 639a46c87b..34628aa82c 100644
--- a/xfa/fwl/basewidget/fwl_listboximp.cpp
+++ b/xfa/fwl/basewidget/fwl_listboximp.cpp
@@ -743,9 +743,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, pItem, rtItem);
+        pBox->SetItemRect(m_pInterface, pItem, rtItem);
       }
       fs.y += r.height;
       if (fs.x < r.width) {