From b78209ae74af5bf4fc5dacde8c9b7e709cbb1a70 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sun, 7 Feb 2016 00:19:09 +0100 Subject: work on adding crash report UI Change-Id: I66f4dca3cd32381ecd52cc36490e7ee1dddf3699 Reviewed-on: https://gerrit.libreoffice.org/22566 Tested-by: Jenkins Reviewed-by: Markus Mohrhard --- desktop/source/app/sofficemain.cxx | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'desktop/source/app/sofficemain.cxx') diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 866c19859f10..3484b8437737 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -65,14 +65,6 @@ #if HAVE_FEATURE_BREAKPAD -OString getLibDir() -{ - OUString aOriginal = "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER; - rtl::Bootstrap::expandMacros(aOriginal); - - return rtl::OUStringToOString(aOriginal, RTL_TEXTENCODING_UTF8); -} - #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded) { @@ -80,11 +72,7 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, std::ofstream minidump_file(ini_path, std::ios_base::app); minidump_file << "DumpFile=" << descriptor.path() << "\n";; minidump_file.close(); - // send the minidump to the server (not yet implemented) - SAL_WARN("destkop.crashreport", "minidump generated: " << descriptor.path()); - OString aCommand = getLibDir().copy(7) + "/minidump_upload " + ini_path.c_str(); - int retVal = std::system(aCommand.getStr()); - SAL_WARN_IF(retVal != 0, "destkop.crashreport", "Failed to upload minidump. Error Code: " << retVal); + SAL_WARN("crashreport", "minidump generated: " << descriptor.path()); return succeeded; } #endif @@ -93,14 +81,6 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, extern "C" int DESKTOP_DLLPUBLIC soffice_main() { #if HAVE_FEATURE_BREAKPAD - //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 << "Version=" LIBO_VERSION_DOTTED "\n"; - minidump_file << "URL=http://127.0.0.1:8000/submit\n"; - minidump_file.close(); #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID google_breakpad::MinidumpDescriptor descriptor("/tmp"); -- cgit