diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 15:00:03 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:01:48 +0100 |
| commit | d1091fd50adb1c01d1b1393fd662278611f9e7e1 (patch) | |
| tree | db279bb0b9641b8e912c55d72ce4a9a7ccb2f4b5 /fpicker | |
| parent | 58a43332b3a86db3756e6ad18e31189969c85364 (diff) | |
re-insert erroneously converted delete calls.
Change-Id: Iebdf2af3866d884289f6913646106fe3f2d4dde5
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/commonpicker.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 95ee24b14db8..f23756858a43 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -148,7 +148,11 @@ namespace svt { stopWindowListening(); - m_pDlg.clear(); + if ( !bDialogDying ) // it's the parent which is dying -> delete the dialog + m_pDlg.disposeAndClear(); + else + m_pDlg.clear(); + m_xWindow = NULL; m_xDialogParent = NULL; } |