Index: xfa/src/fwl/src/lightwidget/datetimepicker.cpp |
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp |
index 60e0e30b4e0e0345f551d175cfca8f88a6630e4f..3138e385186e3310f2a07a9dcd13c645dda89f74 100644 |
--- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp |
+++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp |
@@ -15,17 +15,19 @@ FWL_ERR CFWL_DateTimePicker::Initialize( |
if (pProperties) { |
*m_pProperties = *pProperties; |
} |
- m_pIface = new IFWL_DateTimePicker; |
- FWL_ERR ret = |
- ((IFWL_DateTimePicker*)m_pIface) |
- ->Initialize( |
- m_pProperties->MakeWidgetImpProperties(&m_DateTimePickerDP), |
- nullptr); |
- if (ret == FWL_ERR_Succeeded) { |
- CFWL_Widget::Initialize(); |
+ nonstd::unique_ptr<IFWL_DateTimePicker> pDateTimePicker( |
+ IFWL_DateTimePicker::Create( |
+ m_pProperties->MakeWidgetImpProperties(&m_DateTimePickerDP), |
+ nullptr)); |
+ FWL_ERR ret = pDateTimePicker->Initialize(); |
+ if (ret != FWL_ERR_Succeeded) { |
+ return ret; |
} |
- return ret; |
+ m_pIface = pDateTimePicker.release(); |
+ CFWL_Widget::Initialize(); |
+ return FWL_ERR_Succeeded; |
} |
+ |
FWL_ERR CFWL_DateTimePicker::SetToday(int32_t iYear, |
int32_t iMonth, |
int32_t iDay) { |