[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - vcl/unx vcl/win

[Markus Mohrhard]

 vcl/unx/generic/plugadapt/salplug.cxx |    4 ++++
 vcl/win/app/salinst.cxx               |    3 +++
 2 files changed, 7 insertions(+)

New commits:
commit 60c3c615c8cf4e1f2ccb9d61c5f0d748827bb828
Author: Markus Mohrhard <markus.mohrhard at 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 <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit 1b206f37d0f9b61ebc908f58b33515c055ff1a75)
    Reviewed-on: https://gerrit.libreoffice.org/31586
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.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 906129f..3551fb4 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, NULL );
         FatalAppExitW( 0, reinterpret_cast<LPCWSTR>(rErrorText.getStr()) );