[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - instsetoo_native/util scp2/source

[Juergen Funk (via logerrit)]

 instsetoo_native/util/openoffice.lst.in |    1 +
 scp2/source/ooo/common_brand.scp        |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6d1a04be2c2eb2b5ec3ba86fab05f424974f5a1f
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Tue Nov 19 10:07:25 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Jan 23 15:47:14 2020 +0100

    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 at 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 at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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