[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - svx/source

[Mike Kaganski (via logerrit)]

 svx/source/dialog/crashreportdlg.cxx |    9 +++++++++
 svx/source/dialog/crashreportdlg.hxx |    2 ++
 2 files changed, 11 insertions(+)

New commits:
commit 9d1c51265b419ea8e4084e2de30f740984380fa5
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Oct 22 14:45:11 2022 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Oct 22 21:21:00 2022 +0200

    Set InstallLOKNotifier handler for CrashReportDialog
    
    This prevents assertion failure in Window::SetLOKNotifier
    called from Dialog::ImplStartExecute in gtktiledviewer.
    
    Change-Id: I5c67d85728a34e47c36c73dafa616df45afa8092
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141589
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit 7b04e44d4e909e4a6e48a894ec5ad00cacbbcbf5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141592
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/svx/source/dialog/crashreportdlg.cxx 
b/svx/source/dialog/crashreportdlg.cxx
index 8492ca3eccf3..4effe1dc636c 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -15,10 +15,17 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/configmgr.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/task/OfficeRestartManager.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
+IMPL_STATIC_LINK_NOARG(CrashReportDialog, InstallLOKNotifierHdl, void*,
+                       vcl::ILibreOfficeKitNotifier*)
+{
+    return GetpApp();
+}
+
 CrashReportDialog::CrashReportDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "svx/ui/crashreportdlg.ui", 
"CrashReportDialog")
     , mxBtnSend(m_xBuilder->weld_button("btn_send"))
@@ -46,6 +53,8 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
         officecfg::Office::Common::Menus::PrivacyPolicyURL::get()
         + "?type=crashreport&LOvers=" + utl::ConfigManager::getProductVersion()
         + "&LOlocale=" + 
LanguageTag(utl::ConfigManager::getUILocale()).getBcp47());
+
+    m_xDialog->SetInstallLOKNotifierHdl(LINK(this, CrashReportDialog, 
InstallLOKNotifierHdl));
 }
 
 CrashReportDialog::~CrashReportDialog() {}
diff --git a/svx/source/dialog/crashreportdlg.hxx 
b/svx/source/dialog/crashreportdlg.hxx
index 10bd77ef89c6..298d34cc8d87 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -32,6 +32,8 @@ private:
     OUString maSuccessMsg;
 
     DECL_LINK(BtnHdl, weld::Button&, void);
+    DECL_STATIC_LINK(CrashReportDialog, InstallLOKNotifierHdl, void*,
+                     vcl::ILibreOfficeKitNotifier*);
 };
 
 #endif