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

[Andras Timar]

 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 95a73f5e3222c4cbb9a77a12b37610b982ea1f06
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 29 16:55:17 2017 +0200

    enable crashreport on Windows
    
    (cherry picked from commit ce263269dff121af85634ada7870f33632e02bdd)
    
    Change-Id: I55df3da63919f76afcd4905b1898287e26c8c4f1

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 29001367bb91..177a8750e513 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -76,7 +76,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);
@@ -84,7 +84,7 @@ void CrashReporter::writeCommonInfo()
     // limit the amount of code that needs to be executed before the crash reporting
     std::string ini_path = CrashReporter::getIniFileName();
     std::ofstream minidump_file(ini_path, std::ios_base::trunc);
-    minidump_file << "ProductName=LibreOffice\n";
+    minidump_file << "ProductName=CollaboraOffice\n";
     minidump_file << "Version=" LIBO_VERSION_DOTTED "\n";
     minidump_file << "BuildID=" << utl::Bootstrap::getBuildIdData("") << "\n";
     minidump_file << "URL=" << protocol << "://" << url << "/submit/\n";
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index ffca66d6a84a..ed3247bc6a26 100644
--- a/svx/uiconfig/ui/crashreportdlg.ui
+++ b/svx/uiconfig/ui/crashreportdlg.ui
@@ -87,7 +87,7 @@ You can help us to fix this issue by sending an anonymous crash report to the %P
             <property name="xalign">0</property>
             <property name="label" 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>
             <property name="wrap">True</property>
             <property name="selectable">True</property>
           </object>