handle children of deferred dialog better

Change-Id: I86f0a23408c031a99a31cd309defec519a2e91ec

1 files changed, 8 insertions, 0 deletions

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 67bf87159a8c..63fce3934281 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -57,6 +57,8 @@ VclBuilder::VclBuilder(Window *pParent, OUString sUIDir, OUString sUIFile, OStri
     , m_pParent(pParent)
     , m_pParserState(new ParserState)
 {
+    m_bToplevelHasDeferredInit = (pParent && pParent->IsDialog()) ? ((Dialog*)pParent)->isDeferredInit() : false;
+
     sal_Int32 nIdx = m_sHelpRoot.lastIndexOf('.');
     if (nIdx != -1)
         m_sHelpRoot = m_sHelpRoot.copy(0, nIdx);
@@ -685,6 +687,7 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O
         {
             Dialog *pDialog = (Dialog*)pCurrentChild;
             pDialog->doDeferredInit(extractResizable(rMap));
+            m_bToplevelHasDeferredInit = false;
         }
         if (pCurrentChild->GetHelpId().isEmpty())
         {
@@ -696,6 +699,11 @@ Window *VclBuilder::insertObject(Window *pParent, const OString &rClass, const O
     }
     else
     {
+        //if we're being inserting under a toplevel dialog whose init is
+        //deferred due to waiting to encounter it in this .ui, and it hasn't
+        //been seen yet, then make unattached widgets parent-less toplevels
+        if (pParent == m_pParent && m_bToplevelHasDeferredInit)
+            pParent = NULL;
         pCurrentChild = makeObject(pParent, rClass, rID, rMap);
     }