commit 9a78a4a16ff7b9a9d8f22809c5127f6389ec4805
author Caolán McNamara <caolanm@redhat.com> Fri May 10 10:22:27 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri May 10 15:56:15 2019 +0200
tree a3cd6a8a84f92ee810388b21d76b56216a0cea31
parent 99fb06dd8c0e35e519a888e4c5c2c9805104a683

Resolves: tdf#125198 modeless dialog not appearing in online

Change-Id: I01916000ba2300a3905fe606301abd8ddadd3770
Reviewed-on: https://gerrit.libreoffice.org/72113
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/window/dialog.cxx

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1219b31..c1921d2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -883,16 +883,19 @@ bool Dialog::ImplStartExecute()
    ImplSVData* pSVData = ImplGetSVData();

    const bool bKitActive = comphelper::LibreOfficeKit::isActive();
    if (bKitActive && !GetLOKNotifier())
    {
        if (vcl::ILibreOfficeKitNotifier* pViewShell = mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr))
            SetLOKNotifier(pViewShell);
    }

    const bool bModal = GetType() != WindowType::MODELESSDIALOG;

    if (bModal)
    {
        if (bKitActive && !GetLOKNotifier())
        {
            if (vcl::ILibreOfficeKitNotifier* pViewShell = mpDialogImpl->m_aInstallLOKNotifierHdl.Call(nullptr))
            {
                SetLOKNotifier(pViewShell);
            }
        }

        switch ( Application::GetDialogCancelMode() )
        {
        case DialogCancelMode::Off: