| Index: xfa/fxfa/app/xfa_ffpushbutton.cpp
|
| diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp
|
| index 3893bc29fbb486886bc66d46f40f7cad48d5a39f..6db2b7078c6d5d0f51d65798ec69bb2d34d03ecc 100644
|
| --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp
|
| +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp
|
| @@ -86,25 +86,19 @@ void CXFA_FFPushButton::UpdateWidgetProperty() {
|
| }
|
| m_pNormalWidget->ModifyStylesEx(dwStyleEx, 0xFFFFFFFF);
|
| }
|
| +
|
| void CXFA_FFPushButton::UnloadWidget() {
|
| - if (m_pRolloverTextLayout) {
|
| - delete m_pRolloverTextLayout;
|
| - m_pRolloverTextLayout = NULL;
|
| - }
|
| - if (m_pDownTextLayout) {
|
| - delete m_pDownTextLayout;
|
| - m_pDownTextLayout = NULL;
|
| - }
|
| - if (m_pDownProvider) {
|
| - delete m_pDownProvider;
|
| - m_pDownProvider = NULL;
|
| - }
|
| - if (m_pRollProvider) {
|
| - delete m_pRollProvider;
|
| - m_pRollProvider = NULL;
|
| - }
|
| + delete m_pRolloverTextLayout;
|
| + m_pRolloverTextLayout = nullptr;
|
| + delete m_pDownTextLayout;
|
| + m_pDownTextLayout = nullptr;
|
| + delete m_pDownProvider;
|
| + m_pDownProvider = nullptr;
|
| + delete m_pRollProvider;
|
| + m_pRollProvider = nullptr;
|
| CXFA_FFField::UnloadWidget();
|
| }
|
| +
|
| FX_BOOL CXFA_FFPushButton::PerformLayout() {
|
| CXFA_FFWidget::PerformLayout();
|
| CFX_RectF rtWidget;
|
|
|