vcl/source/window/dialog.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
New commits: commit 9a78a4a16ff7b9a9d8f22809c5127f6389ec4805 Author: Caolán McNamara <[email protected]> AuthorDate: Fri May 10 10:22:27 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri May 10 15:56:15 2019 +0200 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1219b312a26b..c1921d238c67 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: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
