summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-02-23 14:19:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-02-23 14:19:35 +0100
commit2bec27302a06268cfd4174e7a0c94198fdbd0ae9 (patch)
tree715a116a68b16832985def04f93f1db4029c9434 /desktop
parent0926adba5557eab2114a57c30d92c977d334f57a (diff)
Various loplugin warnings
Change-Id: I6489043ee629e1f411f303c1c43a00975aacf5c4
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/app/sofficemain.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index f78dfd3456c2..abdcd3777fcb 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -74,11 +74,11 @@ OString getLibDir()
static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* /*context*/, bool succeeded)
{
// send the minidump to the server (not yet implemented)
- SAL_WARN("crashreport", "minidump generated: " << descriptor.path());
+ SAL_WARN("destkop.crashreport", "minidump generated: " << descriptor.path());
OString aCommand = getLibDir().copy(7) + "/minidump_upload -p LibreOffice -v \"5.1.0.0\" ";
- aCommand = aCommand + descriptor.path() + " " + "http://libreofficecrash.org/submit";
+ aCommand = aCommand + descriptor.path() + " http://libreofficecrash.org/submit";
int retVal = std::system(aCommand.getStr());
- SAL_WARN_IF(retVal != 0, "crashreport", "Failed to upload minidump. Error Code: " << retVal);
+ SAL_WARN_IF(retVal != 0, "destkop.crashreport", "Failed to upload minidump. Error Code: " << retVal);
return succeeded;
}
#endif
@@ -91,7 +91,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
google_breakpad::MinidumpDescriptor descriptor("/tmp");
- google_breakpad::ExceptionHandler eh(descriptor, NULL, dumpCallback, NULL, true, -1);
+ google_breakpad::ExceptionHandler eh(descriptor, nullptr, dumpCallback, nullptr, true, -1);
#else
#endif