diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2019-11-19 10:07:25 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-11-22 14:31:07 +0100 |
| commit | 1908393e7861f45aea616a192059ccbd9b62b5a4 (patch) | |
| tree | c6c8889cfacafbbf8d6006cb0d6df7ae2d02dbc8 | |
| parent | add5fce368b6fab320b6ded60b7875599863a195 (diff) | |
tdf#127711 Fix msi-soffice.ini CrashDumpEnable-entry
when the switch --disable-crashdump is set, then the
switch "CrashDumpEnable" set to "false", was only in
instdir/program/soffice.ini, but was not
in soffice.ini in msi it was always true
Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b
Reviewed-on: https://gerrit.libreoffice.org/83171
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2)
Reviewed-on: https://gerrit.libreoffice.org/83289
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 65c488bef8a7..1a2fdb5540f0 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -34,6 +34,7 @@ Globals OOODOWNLOADNAME 1 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ + CRASHDUMPENABLE @DEFAULT_CRASHDUMP_VALUE@ } } } diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 1209c5786fb5..e46bd98acd60 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -444,7 +444,7 @@ ProfileItem gid_Brand_Profileitem_Soffice_CrashDump ModuleID = gid_Module_Root_Brand; Section = "Bootstrap"; Key = "CrashDumpEnable"; - Value = "true"; + Value = "${CRASHDUMPENABLE}"; End |