[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - framework/Library_fwk.mk framework/source

[Markus Mohrhard]

 framework/Library_fwk.mk              |    2 ++
 framework/source/services/desktop.cxx |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit f5695bf6a868e14e28f06697b2803ff7d325e7cb
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Dec 28 23:57:36 2016 +0100

    add a crashreporter entry when we start the shutdown
    
    This will help us identify shutdown related crashes.
    
    Reviewed-on: https://gerrit.libreoffice.org/32485
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    
    Conflicts:
    	framework/source/services/desktop.cxx
    
    Change-Id: Id09c3dfdc94c430d5dcb2aebb017f17db80f17e5
    Reviewed-on: https://gerrit.libreoffice.org/32487
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index e6d0ae2..2246286 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Library_use_libraries,fwk,\
     comphelper \
     cppu \
     cppuhelper \
+    $(call gb_Helper_optional,BREAKPAD, \
+		crashreport) \
     fwe \
     fwi \
     i18nlangtag \
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index c8bf51f..e069905 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -62,6 +62,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/instance.hxx>
 #include <vcl/svapp.hxx>
+#include <desktop/crashreport.hxx>
 
 #include <tools/errinf.hxx>
 #include <unotools/configmgr.hxx>
@@ -317,6 +318,7 @@ sal_Bool SAL_CALL Desktop::terminate()
             // see dispose() for further information.
             /* SAFE AREA --------------------------------------------------------------------------------------- */
             SolarMutexClearableGuard aWriteLock;
+            CrashReporter::AddKeyValue("ShutDown", OUString::boolean(true));
             m_bIsTerminated = true;
             aWriteLock.clear();
             /* UNSAFE AREA ------------------------------------------------------------------------------------- */