[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - framework/source

[Caolán McNamara]

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

New commits:
commit be83e928279bf3c6ae3fd316571d02dc452b45e8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 12 15:25:32 2018 +0000

    tdf#116277 blank frame into which document will load shown too early
    
    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/51152
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 6ad9498f776f..a2cfb5e2b9f7 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1074,7 +1074,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);
         }
     }