[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - bin/upload_symbols.py desktop/source svx/uiconfig

[Andras Timar (via logerrit)]

 bin/upload_symbols.py              |    4 ++--
 desktop/source/app/crashreport.cxx |    4 ++--
 svx/uiconfig/ui/crashreportdlg.ui  |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 04bcb4815690fe21154cff22a66e534017f28753
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Mar 29 16:55:17 2017 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu May 21 17:12:28 2020 +0200

    enable crashreport on Windows
    
    (cherry picked from commit ce263269dff121af85634ada7870f33632e02bdd)
    
    Change-Id: I55df3da63919f76afcd4905b1898287e26c8c4f1
    Reviewed-on: https://gerrit.libreoffice.org/78401
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94477
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/bin/upload_symbols.py b/bin/upload_symbols.py
index 72a03b6e56db..381f08a5ebd1 100755
--- a/bin/upload_symbols.py
+++ b/bin/upload_symbols.py
@@ -19,8 +19,8 @@ def main():
         print("Usage: upload-symbols.py symbols.zip config.ini \"long explanation\" [--system]")
         sys.exit(1)
 
-    upload_url = "http://crashreport.libreoffice.org/upload/"
-    login_url = "http://crashreport.libreoffice.org/accounts/login/"
+    upload_url = "http://crashreport.collaboraoffice.com/upload/"
+    login_url = "http://crashreport.collaboraoffice.com/accounts/login/"
 
     config = configparser.ConfigParser()
     config.read(sys.argv[2])
diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx
index 743ae43e7c9b..496e8ccab5d2 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -112,7 +112,7 @@ void CrashReporter::writeCommonInfo()
     ucbhelper::InternetProxyDecider proxy_decider(::comphelper::getProcessComponentContext());
 
     const OUString protocol = "https";
-    const OUString url = "crashreport.libreoffice.org";
+    const OUString url = "crashreport.collaboraoffice.com";
     const sal_Int32 port = 443;
 
     const ucbhelper::InternetProxyServer proxy_server = proxy_decider.getProxy(protocol, url, port);
@@ -123,7 +123,7 @@ void CrashReporter::writeCommonInfo()
     maKeyValues.clear();
 
     // limit the amount of code that needs to be executed before the crash reporting
-    addKeyValue("ProductName", "LibreOffice", AddItem);
+    addKeyValue("ProductName", "CollaboraOffice", AddItem);
     addKeyValue("Version", LIBO_VERSION_DOTTED, AddItem);
     addKeyValue("BuildID", utl::Bootstrap::getBuildIdData(""), AddItem);
     addKeyValue("URL", protocol + "://" + url + "/submit/", AddItem);
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 68741c6b362d..b5de76bec904 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -5,7 +5,7 @@
   <object class="GtkTextBuffer" id="textbuffer1">
     <property name="text" translatable="yes" context="crashreportdlg|ed_post">The crash report was successfully uploaded.
 You can soon find the report at:
-crashreport.libreoffice.org/stats/crash_details/%CRASHID</property>
+crashreport.collaboraoffice.com/stats/crash_details/%CRASHID</property>
   </object>
   <object class="GtkTextBuffer" id="textbuffer2">
     <property name="text" translatable="yes" context="crashreportdlg|ed_bugreport">Please check the report and if no bug report is connected to the crash report yet, open a new bug report at bugs.documentfoundation.org.