desktop/source/app/app.cxx | 3 -
desktop/source/app/crashreport.cxx | 12 ++++-
svx/source/dialog/crashreportdlg.cxx | 2
svx/source/dialog/crashreportdlg.hxx | 1
svx/uiconfig/ui/crashreportdlg.ui | 74 +----------------------------------
5 files changed, 16 insertions(+), 76 deletions(-)
New commits:
commit d92aaa651b628f8ede41667f39b0745ee68064cc
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Wed Dec 8 10:40:44 2021 +0100
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Thu Oct 17 11:28:50 2024 +0200
Adapt crash submitted dialog
Don't link to crashreport site, just show the ID
Change-Id: I436b4503657ca42afb98ca5efb5a7f306b102df8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126539
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156497
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175002
Tested-by: allotropia jenkins <jenk...@allotropia.de>
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/svx/source/dialog/crashreportdlg.cxx
b/svx/source/dialog/crashreportdlg.cxx
index aad28436eea3..e81423dbb318 100644
--- a/svx/source/dialog/crashreportdlg.cxx
+++ b/svx/source/dialog/crashreportdlg.cxx
@@ -34,7 +34,6 @@ CrashReportDialog::CrashReportDialog(weld::Window* pParent)
, mxEditPreUpload(m_xBuilder->weld_label("ed_pre"))
, mxEditPostUpload(m_xBuilder->weld_label("ed_post"))
, mxLinkButton(m_xBuilder->weld_link_button("linkbutton"))
- , mxFtBugReport(m_xBuilder->weld_label("ed_bugreport"))
, mxCBSafeMode(m_xBuilder->weld_check_button("check_safemode"))
, mxPrivacyPolicyButton(m_xBuilder->weld_link_button("btnPrivacyPolicy"))
{
@@ -99,7 +98,6 @@ IMPL_LINK(CrashReportDialog, BtnHdl, weld::Button&, rBtn,
void)
mxLinkButton->set_visible(bSuccess);
mxBtnClose->show();
- mxFtBugReport->show();
mxEditPostUpload->show();
mxBtnSend->set_sensitive(false);
mxBtnCancel->set_sensitive(false);
diff --git a/svx/source/dialog/crashreportdlg.hxx
b/svx/source/dialog/crashreportdlg.hxx
index 3f2d9cb121c5..9efd86758235 100644
--- a/svx/source/dialog/crashreportdlg.hxx
+++ b/svx/source/dialog/crashreportdlg.hxx
@@ -26,7 +26,6 @@ private:
std::unique_ptr<weld::Label> mxEditPreUpload;
std::unique_ptr<weld::Label> mxEditPostUpload;
std::unique_ptr<weld::LinkButton> mxLinkButton;
- std::unique_ptr<weld::Label> mxFtBugReport;
std::unique_ptr<weld::CheckButton> mxCBSafeMode;
std::unique_ptr<weld::LinkButton> mxPrivacyPolicyButton;
diff --git a/svx/uiconfig/ui/crashreportdlg.ui
b/svx/uiconfig/ui/crashreportdlg.ui
index 5aa6056366f7..6c62abff6237 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
<object class="GtkDialog" id="CrashReportDialog">
@@ -81,7 +81,7 @@
<property name="hexpand">True</property>
<property name="label" translatable="yes"
context="crashreportdlg|ed_pre">Unfortunately it seems that %PRODUCTNAME
crashed when it was last run.
-You can help us to fix this issue by sending an anonymous crash report to the
%PRODUCTNAME crash reporting server.</property>
+Please contact your IT support with the following ID: %CRASHID</property>
<property name="wrap">True</property>
<property name="max-width-chars">80</property>
<property name="xalign">0</property>
@@ -92,72 +92,6 @@ You can help us to fix this issue by sending an anonymous
crash report to the %P
<property name="position">0</property>
</packing>
</child>
- <child>
- <!-- n-columns=1 n-rows=2 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="row-spacing">3</property>
- <child>
- <object class="GtkLinkButton" id="linkbutton">
- <property name="label"
translatable="no">https://crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
- <property name="no-show-all">True</property>
- <property name="halign">start</property>
- <property name="hexpand">True</property>
- <property name="relief">none</property>
- <property
name="uri">https://crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="ed_post">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="crashreportdlg|ed_post">The crash report was successfully uploaded.
You can soon find the report at:</property>
- <property name="use-underline">True</property>
- <property name="wrap">True</property>
- <property name="mnemonic-widget">linkbutton</property>
- <property name="max-width-chars">80</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="ed_bugreport">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="crashreportdlg|ed_bugreport">Please check the report and if no bug
report is connected to the crash report yet, open a new bug report at
bugs.documentfoundation.org.
-
-Add detailed instructions on how to reproduce the crash and the shown crash ID
into the crash report field.
-
-Thank you for your help in improving %PRODUCTNAME.</property>
- <property name="wrap">True</property>
- <property name="max-width-chars">80</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="check_safemode">
<property name="label" translatable="yes"
context="crashreportdlg|check_safemode">Restart %PRODUCTNAME to enter safe
mode</property>
@@ -169,7 +103,7 @@ Thank you for your help in improving
%PRODUCTNAME.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -183,7 +117,7 @@ Thank you for your help in improving
%PRODUCTNAME.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
commit 2d58ab78656c03dfd3a62af584f1f8f2a25e06a0
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Apr 21 19:06:44 2020 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Thu Oct 17 11:28:40 2024 +0200
Some optimisations around crashreporter status queries
* make dump enable status query static
* only offer crash UI if dump is enabled
cherry-pick from commit: f67e4da406f8753fb041705cf197690e7fd9a0aa
Change-Id: I71aff4c6ca5a73e4d1db6163cdf8dec75b9e7538
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156490
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175001
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: allotropia jenkins <jenk...@allotropia.de>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 14b29ba028aa..c3eb7f985384 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2022,7 +2022,8 @@ void Desktop::OpenClients()
#endif
#if HAVE_FEATURE_BREAKPAD
- if (officecfg::Office::Common::Misc::CrashReport::get() &&
CrashReporter::crashReportInfoExists())
+ if (CrashReporter::IsDumpEnable() &&
+ officecfg::Office::Common::Misc::CrashReport::get() &&
CrashReporter::crashReportInfoExists())
handleCrashReport();
#endif
diff --git a/desktop/source/app/crashreport.cxx
b/desktop/source/app/crashreport.cxx
index b90a04907f69..fd1bd5402768 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -278,13 +278,21 @@ bool CrashReporter::IsDumpEnable()
if (env != nullptr && env[0] != '
return true;
}
+
+ static bool bConfigRead = false;
+ static bool bEnable = true; // default, always on
+
+ if (bConfigRead)
+ return bEnable;
+
// read configuration item 'CrashDumpEnable' -> bool on/off
OUString sToken;
if (rtl::Bootstrap::get("CrashDumpEnable", sToken))
{
- return sToken.toBoolean();
+ bEnable = sToken.toBoolean();
}
- return true; // default, always on
+ bConfigRead = true;
+ return bEnable;
}
