diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-30 17:52:43 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:13:59 +0100 |
commit | c7f3e599da3f4adf0c8cfe6e087948dc8f61bcce (patch) | |
tree | d2fa7051bb9c0c79f824bf3256a18acaecf00df4 /vcl/source/window/dialog.cxx | |
parent | 582e89610b366c0d887baa6b8de7fa5f065900fa (diff) |
Revert part of "Unwind mpDialogParent oddness."
Now its ok to reference / un-reference ourself during construction.
Change-Id: Ib3b302719c7d40d7a42272f93db5e4c437859cad
Diffstat (limited to 'vcl/source/window/dialog.cxx')
-rw-r--r-- | vcl/source/window/dialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index e59ba305a80a..0e29d4a44ca3 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -488,7 +488,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; |