[Libreoffice-commits] core.git: desktop/source include/sal

[Stephan Bergmann]

 desktop/source/app/sofficemain.cxx |    8 ++++----
 include/sal/log-areas.dox          |    1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2bec27302a06268cfd4174e7a0c94198fdbd0ae9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 23 14:19:21 2016 +0100

    Various loplugin warnings
    
    Change-Id: I6489043ee629e1f411f303c1c43a00975aacf5c4

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index f78dfd3..abdcd37 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
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index b4b3184..b83eba7 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -131,6 +131,7 @@ certain functionality.
 
 @li @c desktop
 @li @c desktop.app
+ at li @c destkop.crashreport
 @li @c desktop.deployment
 @li @c desktop.lib
 @li @c desktop.migration