Index: xfa/src/fwl/src/lightwidget/barcode.cpp |
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp |
index d0f3be46f387cef64e043167cd8b34f46d245107..15b0a40d915d1673cf5fb27f282ff3e2441b099e 100644 |
--- a/xfa/src/fwl/src/lightwidget/barcode.cpp |
+++ b/xfa/src/fwl/src/lightwidget/barcode.cpp |
@@ -14,15 +14,15 @@ FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) { |
if (pProperties) { |
*m_pProperties = *pProperties; |
} |
- m_pIface = new IFWL_Barcode; |
- FWL_ERR ret = |
- ((IFWL_Barcode*)m_pIface) |
- ->Initialize(m_pProperties->MakeWidgetImpProperties(&m_barcodeData), |
- nullptr); |
- if (ret == FWL_ERR_Succeeded) { |
- CFWL_Widget::Initialize(); |
+ nonstd::unique_ptr<IFWL_Barcode> pBarcode(IFWL_Barcode::Create( |
+ m_pProperties->MakeWidgetImpProperties(&m_barcodeData))); |
+ FWL_ERR ret = pBarcode->Initialize(); |
+ if (ret != FWL_ERR_Succeeded) { |
+ return ret; |
} |
- return ret; |
+ m_pIface = pBarcode.release(); |
+ CFWL_Widget::Initialize(); |
+ return FWL_ERR_Succeeded; |
} |
CFWL_Barcode::CFWL_Barcode() {} |
CFWL_Barcode::~CFWL_Barcode() {} |