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 <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>

3 files changed, 2 insertions, 40 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 90254147089d..e91e7dec2034 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 66c79ca6ad21..755da5920e09 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/source/inc/exithelper.h b/desktop/source/inc/exithelper.h
deleted file mode 100644
index b29af5b8f8d0..000000000000
--- a/desktop/source/inc/exithelper.h
+++ /dev/null
@@ -1,38 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   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
-
-enum EExitCodes {
-    /* e.g. used to force showing of the command line help */
-    EXITHELPER_NO_ERROR = 0,
-    /* pipe was detected - second office must terminate itself */
-    EXITHELPER_SECOND_OFFICE = 1,
-    /* an uno exception was catched during startup */
-    EXITHELPER_FATAL_ERROR = 77,
-    /* user force automatic restart after crash */
-    EXITHELPER_CRASH_WITH_RESTART = 79,
-    /* the office restarts itself */
-    EXITHELPER_NORMAL_RESTART = 81
-};
-
-#endif // INCLUDED_DESKTOP_SOURCE_INC_EXITHELPER_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */