summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Funk <juergen.funk_ml@cib.de>2019-11-19 10:07:25 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-01-23 15:47:14 +0100
commit6d1a04be2c2eb2b5ec3ba86fab05f424974f5a1f (patch)
tree8940ed7e2251083c4d1d5aed8aa0b7493b066d57
parenta1b6dc0d58d45f00198bf4755006ebbf66a8c365 (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 Reviewed-on: https://gerrit.libreoffice.org/83171 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2) §§{JNKCMD:NoBuild}§§ Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87264 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
-rw-r--r--instsetoo_native/util/openoffice.lst.in1
-rw-r--r--scp2/source/ooo/common_brand.scp2
2 files changed, 2 insertions, 1 deletions
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 8394418d5fe6..2d3ed7b9473f 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -35,6 +35,7 @@ Globals
STARTCENTER_HIDE_EXTERNAL_LINKS 0
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