[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

[Michael Meeks]

 vcl/source/window/dialog.cxx |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 0c0ae671eb257c8508984b7ed206cb404c3eab69
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 27 14:12:28 2015 +0000

    repair dialog related lifecycle bits.
    
    Change-Id: I33ec0318a257929583aa4bb0d107f16d1f8edbcd

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5101e2a..8edc7ee 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -492,7 +492,7 @@ OUString VclBuilderContainer::getUIRootDir()
 //do the init. Find the real parent stashed in mpDialogParent.
 void Dialog::doDeferredInit(WinBits nBits)
 {
-    vcl::Window *pParent = mpDialogParent;
+    VclPtr<vcl::Window> pParent = mpDialogParent;
     mpDialogParent = NULL;
     ImplInit(pParent, nBits);
     mbIsDefferedInit = false;
@@ -554,9 +554,10 @@ void Dialog::dispose()
 {
     delete mpDialogImpl;
     mpDialogImpl = NULL;
-    mpPrevExecuteDlg.disposeAndClear();
-    mpActionArea.disposeAndClear();
-    mpContentArea.disposeAndClear();
+
+    mpPrevExecuteDlg.clear();
+    mpActionArea.clear();
+    mpContentArea.clear();
     SystemWindow::dispose();
 }