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

[Andras Timar]

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

New commits:
commit ce263269dff121af85634ada7870f33632e02bdd
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Mar 29 16:55:17 2017 +0200

    enable crashreport on Windows
    
    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 9715fde513c9..27e2f97d1f4b 100644
--- a/desktop/source/app/crashreport.cxx
+++ b/desktop/source/app/crashreport.cxx
@@ -73,7 +73,7 @@ void CrashReporter::writeCommonInfo()
     std::ofstream minidump_file(ini_path, std::ios_base::trunc);
     minidump_file << "ProductName=LibreOffice\n";
     minidump_file << "Version=" LIBO_VERSION_DOTTED "\n";
-    minidump_file << "URL=http://crashreport.libreoffice.org/submit/\n";
+    minidump_file << "URL=http://crashreport.collaboraoffice.com/submit/\n";
     for (auto& keyValue : maKeyValues)
     {
         writeToStream(minidump_file, keyValue.first, keyValue.second);
diff --git a/distro-configs/CPWin32.conf b/distro-configs/CPWin32.conf
index e8bd314c2513..d99422d9f511 100644
--- a/distro-configs/CPWin32.conf
+++ b/distro-configs/CPWin32.conf
@@ -23,3 +23,4 @@
 --with-lang=ar as ast bg bn-IN br ca ca-valencia cy cs da de el en-US en-GB es et eu fi fr ga gd gl gu he hi hr hu id is it ja km kn ko lt lv ml mr nb nl nn oc or pa-IN pl pt pt-BR ro ru sk sl sr sr-Latn sv ta te tr uk vi zh-CN zh-TW
 --enable-windows-build-signing
 --enable-symbols
+--enable-breakpad
diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui
index 4b8b2298a37e..aa8e925179a2 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">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>