diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-08 12:14:30 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-07-05 11:02:50 +0000 |
| commit | f4c68d3ad80734e15d093eeee211519e97e2a8ec (patch) | |
| tree | d304b328723d8f089c2a6636a49b5f8af4018ac2 /svx | |
| parent | 7001ca25ec7251c5bac4a5ff304d1f26794b58a0 (diff) | |
use a dynamic library for minidump shared code
This has the disadvantage to make the minidump_upload executable depend on LibreOffice libraries but there seems to be no other way to make the 7.1 SDK happy.
Change-Id: I82c37f503ed29cb50711eae7db22063f49747a48
Reviewed-on: https://gerrit.libreoffice.org/26055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 3498cd3e7b2c820fc3f3025eb4434666a444fda1)
Reviewed-on: https://gerrit.libreoffice.org/26915
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/Library_svx.mk | 8 | ||||
| -rw-r--r-- | svx/source/dialog/crashreportdlg.cxx | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 2233de44eb35..359e231fd6f7 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -40,14 +40,6 @@ $(eval $(call gb_Library_add_defs,svx,\ $(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx)) -ifeq ($(ENABLE_BREAKPAD),TRUE) - -$(eval $(call gb_Library_use_static_libraries,svx, \ - minidump \ -)) - -endif - $(eval $(call gb_Library_use_libraries,svx,\ basegfx \ sb \ diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index b2aff8ee23d4..3d6b61acb7d9 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -60,7 +60,7 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) std::string ini_path = CrashReporter::getIniFileName(); std::string response; - bool bSuccess = readConfig(ini_path, response); + bool bSuccess = crashreport::readConfig(ini_path, response); OUString aCrashID = OUString::createFromAscii(response.c_str()); |