vcl/unx/generic/plugadapt/salplug.cxx | 4 ++++
vcl/win/app/salinst.cxx | 3 +++
2 files changed, 7 insertions(+)
New commits:
commit 1b206f37d0f9b61ebc908f58b33515c055ff1a75
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Dec 3 04:22:09 2016 +0100
add the SalAbort message to the crash reporter
Change-Id: Ibe08034bcf2a73fb12562c87c2898db1e974376c
Reviewed-on: https://gerrit.libreoffice.org/31577
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 6852c06..ce03253 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -30,6 +30,7 @@
#include "unx/desktops.hxx"
#include <vcl/printerinfomanager.hxx>
#include <config_vclplug.h>
+#include <desktop/crashreport.hxx>
#include <cstdio>
#include <unistd.h>
@@ -288,7 +289,10 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
if( rErrorText.isEmpty() )
std::fprintf( stderr, "Application Error\n" );
else
+ {
+ CrashReporter::AddKeyValue("AbortMessage", rErrorText);
std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText,
osl_getThreadTextEncoding()).getStr() );
+ }
if( bDumpCore )
abort();
else
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index cee4e54..94ae96d 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -43,6 +43,8 @@
#include "salimestatus.hxx"
#include "salsys.hxx"
+#include <desktop/crashreport.hxx>
+
#if defined _MSC_VER
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -100,6 +102,7 @@ void SalAbort( const OUString& rErrorText, bool )
}
else
{
+ CrashReporter::AddKeyValue("AbortMessage", rErrorText);
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, nullptr );
FatalAppExitW( 0, reinterpret_cast<LPCWSTR>(rErrorText.getStr()) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
