diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2019-09-18 11:48:21 +0200 |
|---|---|---|
| committer | Juergen Funk (CIB) <juergen.funk_ml@cib.de> | 2019-10-02 09:43:12 +0200 |
| commit | 2215be5268a646d3cc7d138a0184c6826585b7fb (patch) | |
| tree | 8796002fa707f819a4f9e1b59acf5b9e3d3205d2 /cui | |
| parent | be64610dba55e77998120fd8bf69ad2abdf62b1e (diff) | |
tdf#127711 - A runtime-switch for the MiniCrashDump
- in soffice.ini (sofficerc) the entry "CrashDumpEnable" default is "true"
- when false then the Dump.ini and the dump-file are not written
- when the switch --disable-crashdump is set, then the
switch "CrashDumpEnable" set to "false"
- when the entry "CrashDumpEnable" is missing, in this case is the
default true, too
- the checkbox under Options-General "Send crash reports to ..."
is deactive and shows off (only view, not change the config)
- when set the environment variable "CRASH_DUMP_ENABLE" to any char
then the switch "CrashDumpEnable=false" are overrules with true
and the Dump.ini and dump-file are write
Change-Id: I34e7795640eb95d111e18b0ad46ec67b2c126b19
Reviewed-on: https://gerrit.libreoffice.org/79273
Tested-by: Jenkins
Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/Library_cui.mk | 3 | ||||
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 54e3733daef1..e45e35a8f0e3 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -59,6 +59,9 @@ $(eval $(call gb_Library_use_libraries,cui,\ ucbhelper \ utl \ vcl \ + $(if $(ENABLE_BREAKPAD), \ + crashreport \ + ) \ )) $(eval $(call gb_Library_use_externals,cui,\ diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3c92e50a6ac2..c41a2ab51576 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -51,6 +51,7 @@ #include <officecfg/Setup.hxx> #include <comphelper/configuration.hxx> #include <tools/diagnose_ex.h> +#include <desktop/crashreport.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -392,8 +393,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) m_xCollectUsageInfo->save_state(); #if HAVE_FEATURE_BREAKPAD - m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get()); - m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly()); + m_xCrashReport->set_active(officecfg::Office::Common::Misc::CrashReport::get() && CrashReporter::IsDumpEnable()); + m_xCrashReport->set_sensitive(!officecfg::Office::Common::Misc::CrashReport::isReadOnly() && CrashReporter::IsDumpEnable()); m_xCrashReport->save_state(); #else m_xCrashReport->hide(); |