[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - configure.ac desktop/source

[Thorsten Behrens (via logerrit)]

Rebased ref, commits from common ancestor:
commit 99bde84832c027d5ad13ccadccafbfdcb34d157e
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Apr 21 01:21:21 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Apr 21 08:59:07 2020 +0200

    Bump version to 6.1.7.12
    
    Change-Id: I8c117bca2505b1bae60b54c17c5f5bb5033b7224

diff --git a/configure.ac b/configure.ac
index fe394203bf21..709b2485a05b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
 
-AC_INIT([LibreOffice powered by CIB],[6.1.7.11],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by CIB],[6.1.7.12],[],[],[https://libreoffice.cib.eu/])
 
 AC_PREREQ([2.59])
 
commit 2a6721fdd6efb675cb8e56b56cceb9150d8a92ae
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Apr 21 01:13:46 2020 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Apr 21 08:59:07 2020 +0200

    related tdf#127711: read crashdump URL from ini file
    
    Change-Id: I68f06aaf5b8c053d1deef2021876b1399e422dd7

diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index ab19dc6327d7..379dfa38defd 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -112,9 +112,18 @@ void CrashReporter::writeCommonInfo()
     ucbhelper::InternetProxyDecider proxy_decider(::comphelper::getProcessComponentContext());
 
     const OUString protocol = "https";
-    const OUString url = "crashreport.libreoffice.org";
     const sal_Int32 port = 443;
 
+    // read configuration item 'CrashDumpUrl'
+    OUString url;
+    rtl::Bootstrap::get("CrashDumpUrl", url);
+    if (url.isEmpty())
+    {
+        // no url in config, bail out
+        mbInit = false;
+        return;
+    }
+
     const ucbhelper::InternetProxyServer proxy_server = proxy_decider.getProxy(protocol, url, port);
 
     // save the new Keys