desktop/source/minidump/minidump.cxx | 2 +- desktop/source/minidump/minidump.hxx | 19 ------------------- desktop/source/minidump/minidump_upload.cxx | 4 ++-- include/desktop/minidump.hxx | 19 +++++++++++++++++++ svx/Library_svx.mk | 10 ++++++++++ svx/source/dialog/crashreportdlg.cxx | 9 +++------ 6 files changed, 35 insertions(+), 28 deletions(-)
New commits: commit 47d28949129eb9c4ec450342e41326a6b450590b Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Jun 3 12:37:18 2016 +0200 integrate the minidump upload into the normal LibreOffice Reviewed-on: https://gerrit.libreoffice.org/25863 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> (cherry picked from commit 4e074fb8183ac8649c9cb202da4ce93526c1b6d8) Conflicts: svx/source/dialog/crashreportdlg.cxx Change-Id: Id1808ceebf6c54698f7d1656a0ce96bcaece89ac Reviewed-on: https://gerrit.libreoffice.org/25931 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com> diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index 371d17c..64303d4 100644 --- a/desktop/source/minidump/minidump.cxx +++ b/desktop/source/minidump/minidump.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "minidump.hxx" +#include <desktop/minidump.hxx> #include <map> #include <memory> diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx index 7f8d617..6a581db 100644 --- a/desktop/source/minidump/minidump_upload.cxx +++ b/desktop/source/minidump/minidump_upload.cxx @@ -7,9 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "minidump.hxx" +#include <desktop/minidump.hxx> -#include<iostream> +#include <iostream> int main(int argc, char** argv) { diff --git a/desktop/source/minidump/minidump.hxx b/include/desktop/minidump.hxx similarity index 100% rename from desktop/source/minidump/minidump.hxx rename to include/desktop/minidump.hxx diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index f664d40..c026002 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -40,6 +40,14 @@ $(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 \ @@ -74,6 +82,8 @@ $(eval $(call gb_Library_use_libraries,svx,\ $(eval $(call gb_Library_use_externals,svx,\ boost_headers \ + $(call gb_Helper_optional,BREAKPAD, \ + curl) \ icuuc \ icu_headers \ )) diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index aeb5c14..511199b 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -9,10 +9,12 @@ #include "crashreportdlg.hxx" + #include <config_folders.h> #include <rtl/bootstrap.hxx> #include <desktop/crashreport.hxx> +#include <desktop/minidump.hxx> #include <osl/file.hxx> CrashReportDialog::CrashReportDialog(vcl::Window* pParent): @@ -56,13 +58,8 @@ IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) if (pBtn == mpBtnSend.get()) { std::string ini_path = CrashReporter::getIniFileName(); - OUString aCommand; - osl::FileBase::getSystemPathFromFileURL(getLibDir() + "/minidump_upload" + SAL_EXEEXTENSION, aCommand); - aCommand = aCommand; - OString aOStringCommand = rtl::OUStringToOString(aCommand, RTL_TEXTENCODING_UTF8) + " " + ini_path.c_str(); - int retVal = std::system(aOStringCommand.getStr()); - SAL_WARN_IF(retVal != 0, "svx.dialog", "Failed to upload minidump. Error Code: " << retVal); + readConfig(ini_path); // TODO: moggi: return the id for the user to look it up Close(); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits