[Libreoffice-commits] core.git: framework/source

[Caolán McNamara]

 framework/source/loadenv/loadenv.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 579411ccc38642b395fbfb25c9b4e9e9d280b5d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 20 14:25:39 2018 +0000

    Resolves: tdf#114648 don't show new document until wizard is finished
    
    Change-Id: Ia9cb3fd549c17cb602fa3d7f9163a89697395c77
    Reviewed-on: https://gerrit.libreoffice.org/51648
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 9507db63ba61..c915f80827bb 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1077,7 +1077,8 @@ bool LoadEnv::impl_loadContent()
             }));
             xHandler->initialize(aArguments);
             //show the frame now, unless (tdf#116277) its the labels/business cards slave frame
-            if (m_aURL.Arguments.indexOf("slot=") == -1)
+            //or (tdf#114648) an Interactive case such as the new database wizard
+            if (m_aURL.Arguments != "Interactive" && m_aURL.Arguments.indexOf("slot=") == -1)
                 impl_makeFrameWindowVisible(xWindow, false);
         }
     }