diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 12:55:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-29 16:40:52 +0200 |
| commit | 61fcf830aa5d94e6cc8075d0eaf6af8a6d405bad (patch) | |
| tree | 15e7d9475d47d6638dea7afe74eb7bb87074ca6d /framework/inc/fwidllapi.h | |
| parent | 733023dd10d2f7e95dca2e8e7096ec216d5e9fb2 (diff) | |
Call framework::Desktop::shutdown directly
...instead of via the XJob hack introduced in
a6862a26d6cd17f6b4e4f6577bcd778bf952e65b "tdf#134106: Get rid of
XDesktopInternal again"
Change-Id: Ic533e8faba1a3da65ead74d78f0ab9c4aab1ca6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97397
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework/inc/fwidllapi.h')
| -rw-r--r-- | framework/inc/fwidllapi.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h deleted file mode 100644 index 290f18721ec0..000000000000 --- a/framework/inc/fwidllapi.h +++ /dev/null @@ -1,33 +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_FRAMEWORK_INC_FWIDLLAPI_H -#define INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H - -#include <sal/types.h> - -#if defined(FWI_DLLIMPLEMENTATION) -#define FWI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define FWI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif // INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |