From 64061d8dd687efa1c78e5284ab01f2f16e5817c3 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 30 May 2016 14:17:35 +0300
Subject: Move exithelper.h to include

We will want to use EXITHELPER_CRASH_WITH_RESTART in vcl, too.

Change-Id: If34244a361b157e0e9c7cca55fc34f0574f39984
---
 desktop/source/app/app.cxx                         |  2 +-
 desktop/source/inc/exithelper.h                    | 38 ----------------------
 desktop/unx/source/start.c                         |  2 +-
 desktop/win32/source/officeloader/officeloader.cxx |  2 +-
 4 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 desktop/source/inc/exithelper.h

(limited to 'desktop')

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 38101efaf6b1..05c3f9b6d9f5 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/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: */
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 893c79c4e0b7..b56477dfd39c 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 3f9760f9344f..ea442bd48de8 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>
-- 
cgit