[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/dialog.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 264d0e7cb5385a8c3c2b8ce10b739e107775d8f8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri May 10 10:22:27 2019 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Sun Nov 10 00:20:34 2019 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 9a78a4a16ff7b9a9d8f22809c5127f6389ec4805)

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b5d1b013b97e..a8e5240ec68c 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 Application::DialogCancelMode::Off: