From fc4dfdc9f5ee5ae408f0177d2aaa6ad16d28ca05 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 12 Mar 2018 15:25:32 +0000 Subject: tdf#116277 blank frame into which document will load shown too early MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit normally we want this to be the window that is the parent for any warning or password dialog. But for these (weird, see also impl_findSlotParam) frames dispatched with slotid arguments, they are opened before the dialog which will fill them is launched. Presumably in sane land the dialog would be dispatched from the menu entry, then on its create the frame opened with the desired contents. Change-Id: I1234b648ca1bd7fd2109cb4d3c70d5bfed9ab563 Reviewed-on: https://gerrit.libreoffice.org/51150 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- framework/source/loadenv/loadenv.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index d5819ebb6675..9507db63ba61 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1076,7 +1076,9 @@ bool LoadEnv::impl_loadContent() {"Parent", uno::Any(xWindow)} })); xHandler->initialize(aArguments); - impl_makeFrameWindowVisible(xWindow, false); + //show the frame now, unless (tdf#116277) its the labels/business cards slave frame + if (m_aURL.Arguments.indexOf("slot=") == -1) + impl_makeFrameWindowVisible(xWindow, false); } } -- cgit