[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 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 1908393e7861f45aea616a192059ccbd9b62b5a4
Author:     Juergen Funk <juergen.funk...@cib.de>
AuthorDate: Tue Nov 19 10:07:25 2019 +0100
Commit:     Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri Nov 22 14:31:07 2019 +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
    
    Change-Id: I2668c1425a776fdf5f0c4e4511c2216e8f418a5b
    Reviewed-on: https://gerrit.libreoffice.org/83171
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
    (cherry picked from commit 73524467b9a6a7c4e6d5173aba79d80632ef46e2)
    Reviewed-on: https://gerrit.libreoffice.org/83289

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
 
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits