| Index: xfa/fwl/core/cfwl_barcode.cpp
|
| diff --git a/xfa/fwl/core/cfwl_barcode.cpp b/xfa/fwl/core/cfwl_barcode.cpp
|
| index 5a3f9dd545bc0b677ae63e4f2e9594907cabb640..c17185990e246cd51d2480471655283ea404b064 100644
|
| --- a/xfa/fwl/core/cfwl_barcode.cpp
|
| +++ b/xfa/fwl/core/cfwl_barcode.cpp
|
| @@ -8,34 +8,31 @@
|
|
|
| #include <memory>
|
|
|
| -IFWL_Barcode* CFWL_Barcode::GetWidget() {
|
| - return static_cast<IFWL_Barcode*>(m_pIface.get());
|
| -}
|
| +CFWL_Barcode::CFWL_Barcode(const IFWL_App* app) : CFWL_Edit(app) {}
|
|
|
| -const IFWL_Barcode* CFWL_Barcode::GetWidget() const {
|
| - return static_cast<IFWL_Barcode*>(m_pIface.get());
|
| -}
|
| +CFWL_Barcode::~CFWL_Barcode() {}
|
|
|
| -FWL_Error CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
|
| - if (m_pIface)
|
| - return FWL_Error::Indefinite;
|
| - if (pProperties) {
|
| +void CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
|
| + ASSERT(!m_pIface);
|
| +
|
| + if (pProperties)
|
| *m_pProperties = *pProperties;
|
| - }
|
| - std::unique_ptr<IFWL_Barcode> pBarcode(
|
| - new IFWL_Barcode(m_pProperties->MakeWidgetImpProperties(&m_barcodeData)));
|
| - FWL_Error ret = pBarcode->Initialize();
|
| - if (ret != FWL_Error::Succeeded) {
|
| - return ret;
|
| - }
|
| +
|
| + std::unique_ptr<IFWL_Barcode> pBarcode(new IFWL_Barcode(
|
| + m_pApp, m_pProperties->MakeWidgetImpProperties(&m_barcodeData)));
|
| + pBarcode->Initialize();
|
| +
|
| m_pIface = std::move(pBarcode);
|
| - CFWL_Widget::Initialize();
|
| - return FWL_Error::Succeeded;
|
| + CFWL_Widget::Initialize(pProperties);
|
| }
|
|
|
| -CFWL_Barcode::CFWL_Barcode() {}
|
| +IFWL_Barcode* CFWL_Barcode::GetWidget() {
|
| + return static_cast<IFWL_Barcode*>(m_pIface.get());
|
| +}
|
|
|
| -CFWL_Barcode::~CFWL_Barcode() {}
|
| +const IFWL_Barcode* CFWL_Barcode::GetWidget() const {
|
| + return static_cast<IFWL_Barcode*>(m_pIface.get());
|
| +}
|
|
|
| void CFWL_Barcode::SetType(BC_TYPE type) {
|
| if (GetWidget())
|
|
|