diff options
Diffstat (limited to 'fpicker/source/office/commonpicker.cxx')
| -rw-r--r-- | fpicker/source/office/commonpicker.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 84488d85a1c8..8243d5159223 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -123,8 +123,7 @@ namespace svt m_pDlg->EndDialog( RET_CANCEL ); } - delete m_pDlg; - m_pDlg = NULL; + m_pDlg.clear(); m_xWindow = NULL; m_xDialogParent = NULL; } @@ -149,10 +148,7 @@ namespace svt { stopWindowListening(); - if ( !bDialogDying ) // it's the parent which is dying -> delete the dialog - delete m_pDlg; - - m_pDlg = NULL; + m_pDlg.clear(); m_xWindow = NULL; m_xDialogParent = NULL; } @@ -240,7 +236,7 @@ namespace svt } } - return NULL != m_pDlg; + return nullptr != m_pDlg; } |