diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-22 14:45:11 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-22 18:38:42 +0200 |
| commit | 7b04e44d4e909e4a6e48a894ec5ad00cacbbcbf5 (patch) | |
| tree | c99e6da4062eafc5d7d019d4b3c408f7946fbfc5 /svx/source/dialog | |
| parent | 14a84557331ae9d65d40b820c82027529a6de6fe (diff) | |
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.kaganski@collabora.com>
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/crashreportdlg.cxx | 9 | ||||
| -rw-r--r-- | svx/source/dialog/crashreportdlg.hxx | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index 33c879866cfd..d50f64131b11 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")) @@ -45,6 +52,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 868f86c58e68..f9d477f4d6f5 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 |