commit c7f3e599da3f4adf0c8cfe6e087948dc8f61bcce
author Michael Meeks <michael.meeks@collabora.com> Mon Mar 30 17:52:43 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 13:13:59 2015 +0100
tree d2fa7051bb9c0c79f824bf3256a18acaecf00df4
parent 582e89610b366c0d887baa6b8de7fa5f065900fa

Revert part of "Unwind mpDialogParent oddness."

Now its ok to reference / un-reference ourself during construction.

Change-Id: Ib3b302719c7d40d7a42272f93db5e4c437859cad

include/vcl/dockwin.hxx

diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index bd334ea..71c8181 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -261,7 +261,7 @@ private:
                    mbIsCalculatingInitialLayoutSize:1,
                    mbInitialLayoutDone:1;

    vcl::Window *mpDialogParent; // deliberately not a VclPtr
    VclPtr<vcl::Window>  mpDialogParent;

    SAL_DLLPRIVATE void    ImplInitDockingWindowData();
    SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox);

include/vcl/syswin.hxx

diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 5609d57..f90fb16 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -149,7 +149,7 @@ private:
    Idle            maLayoutIdle;
protected:
    bool            mbIsDefferedInit;
    vcl::Window    *mpDialogParent; // deliberately not a VclPtr
    VclPtr<vcl::Window> mpDialogParent;
public:
    using Window::ImplIsInTaskPaneList;
    SAL_DLLPRIVATE bool ImplIsInTaskPaneList( vcl::Window* pWin );

vcl/source/window/dialog.cxx

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e59ba30..0e29d4a 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;