rearrange matters to get FloatingWindows working loaded from .ui

Change-Id: I099c810533c4590ee3182e1edf27e9038ed44f30

1 files changed, 7 insertions, 10 deletions

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index a3e6ef7b395e..db072cce083f 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -81,6 +81,7 @@ void SystemWindow::Init()
     mbInitialLayoutDone = false;
     mnMenuBarMode       = MENUBAR_MODE_NORMAL;
     mnIcon              = 0;
+    mpDialogParent      = NULL;
 
     //To-Do, reuse maResizeTimer
     maLayoutTimer.SetTimeout(50);
@@ -89,14 +90,15 @@ void SystemWindow::Init()
 
 SystemWindow::SystemWindow(WindowType nType)
     : Window(nType)
+    , mbIsDefferedInit(false)
 {
     Init();
 }
 
-SystemWindow::SystemWindow(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, WindowType nType)
-    : Window(pParent, nType)
+void SystemWindow::loadUI(Window* pParent, const OString& rID, const OUString& rUIXMLDescription)
 {
-    Init();
+    mbIsDefferedInit = true;
+    mpDialogParent = pParent; //should be unset in doDeferredInit
     m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
 }
 
@@ -1102,14 +1104,9 @@ void SystemWindow::DoInitialLayout()
     }
 }
 
-void SystemWindow::StateChanged( StateChangedType nType )
+void SystemWindow::doDeferredInit(bool /*bResizable*/)
 {
-    Window::StateChanged(nType);
-
-    if (nType == STATE_CHANGE_INITSHOW && !mbInitialLayoutDone)
-    {
-        DoInitialLayout();
-    }
+    SAL_WARN("vcl.layout", "SystemWindow in layout without doDeferredInit impl");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */