desktop/source/app/app.cxx | 2 - desktop/source/app/sofficemain.cxx | 2 - desktop/source/inc/exithelper.h | 38 --------------------- desktop/unx/source/start.c | 2 - desktop/win32/source/officeloader/officeloader.cxx | 2 - include/desktop/exithelper.h | 38 +++++++++++++++++++++ 6 files changed, 42 insertions(+), 42 deletions(-)
New commits: commit 9ff6d2113111010672fc826e81529a2ff0e48ad0 Author: Tor Lillqvist <t...@collabora.com> Date: Mon May 30 14:17:35 2016 +0300 Move exithelper.h to include We will want to use EXITHELPER_CRASH_WITH_RESTART in vcl, too. Change-Id: If34244a361b157e0e9c7cca55fc34f0574f39984 (cherry picked from commit 64061d8dd687efa1c78e5284ab01f2f16e5817c3) (cherry picked from commit 46d5d475b114b93a76502d58637468e404a8562b) Reviewed-on: https://gerrit.libreoffice.org/25674 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tor Lillqvist <t...@collabora.com> Tested-by: Tor Lillqvist <t...@collabora.com> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 90254147..e91e7de 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -35,7 +35,6 @@ #include "lockfile.hxx" #include "userinstall.hxx" #include "desktopcontext.hxx" -#include "exithelper.h" #include "migration.hxx" #include <svl/languageoptions.hxx> @@ -76,6 +75,7 @@ #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/office/Quickstart.hpp> +#include <desktop/exithelper.h> #include <sal/log.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/configuration.hxx> diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 66c79ca..755da59 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -25,10 +25,10 @@ #include <desktop/dllapi.h> #include "app.hxx" -#include "exithelper.h" #include "cmdlineargs.hxx" #include "cmdlinehelp.hxx" +#include <desktop/exithelper.h> #include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 893c79c..b56477d 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -25,6 +25,7 @@ #include <string.h> #include <errno.h> +#include <desktop/exithelper.h> #include <osl/process.h> #include <osl/thread.h> #include <rtl/bootstrap.h> @@ -34,7 +35,6 @@ #include <sal/main.h> #include "args.h" -#include "../../source/inc/exithelper.h" #include "pagein.h" #include "splashx.h" diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx index 3f9760f..ea442bd 100644 --- a/desktop/win32/source/officeloader/officeloader.cxx +++ b/desktop/win32/source/officeloader/officeloader.cxx @@ -38,10 +38,10 @@ #include <stdlib.h> #include <systools/win32/uwinapi.h> +#include <desktop/exithelper.h> #include <rtl/string.h> #include <sal/macros.h> -#include "../../../source/inc/exithelper.h" #include "../loader.hxx" #include <config_version.h> diff --git a/desktop/source/inc/exithelper.h b/include/desktop/exithelper.h similarity index 90% rename from desktop/source/inc/exithelper.h rename to include/desktop/exithelper.h index b29af5b..d6e337c 100644 --- a/desktop/source/inc/exithelper.h +++ b/include/desktop/exithelper.h @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H -#define INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H +#ifndef INCLUDED_DESKTOP_EXITHELPER_H +#define INCLUDED_DESKTOP_EXITHELPER_H enum EExitCodes { /* e.g. used to force showing of the command line help */ @@ -33,6 +33,6 @@ enum EExitCodes { EXITHELPER_NORMAL_RESTART = 81 }; -#endif // INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H +#endif // INCLUDED_DESKTOP_EXITHELPER_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits