diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-03 12:37:18 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-04 08:42:02 +0000 |
| commit | 4e074fb8183ac8649c9cb202da4ce93526c1b6d8 (patch) | |
| tree | fd322645af205a5f444119a13f722b0530005d34 /desktop | |
| parent | 2d1fc99275315bd6f45c1b73540f2b55e94bef9f (diff) | |
integrate the minidump upload into the normal LibreOffice
Change-Id: Id1808ceebf6c54698f7d1656a0ce96bcaece89ac
Reviewed-on: https://gerrit.libreoffice.org/25863
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/minidump/minidump.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/minidump/minidump.hxx | 19 | ||||
| -rw-r--r-- | desktop/source/minidump/minidump_upload.cxx | 4 |
3 files changed, 3 insertions, 22 deletions
diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index 371d17cdd3f0..64303d4befdc 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.hxx b/desktop/source/minidump/minidump.hxx deleted file mode 100644 index 21d52e80ddae..000000000000 --- a/desktop/source/minidump/minidump.hxx +++ /dev/null @@ -1,19 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_DESKTOP_MINIDUMP_MINIDUMP_HXX -#define INCLUDED_DESKTOP_MINIDUMP_MINIDUMP_HXX - -#include <string> - -bool readConfig(const std::string& iniPath); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx index 7f8d6170f14b..6a581db6a5a6 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) { |