diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-26 17:33:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-26 19:39:59 +0200 |
commit | 2562df42f8a95f33f339405354b422e52cf42fbf (patch) | |
tree | 54266c71696ed26c035a2c7642c5acd3bd887886 /offapi | |
parent | 69d476ae67ee4b96e5ff3b8d7a2587644c4af97f (diff) |
tdf#134106: Get rid of XDesktopInternal again
For internal functionality that is not meant to be called by client code, I
think it is appropriate to hide it either via XUnoTunnel (but which would have
been a tad incovenient, as it would have meant to make framework::Desktop in
framework/inc/services/desktop.hxx available to the code in
desktop/source/app/app.cxx), or via reuse of some existing, sufficently fitting
interface (as is done here with css.task.XJob). This nicely avoids the
backwards compatibilty issue with remote Python scripts, as discussed in
tdf#134106 "Binary URP bridge disposed during call to
ServiceManager.createInstanceWithContext".
Change-Id: Ic9db9401ddf0f6b696344dd1d5c6ad279ea5a832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97241
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
(cherry picked from commit a6862a26d6cd17f6b4e4f6577bcd778bf952e65b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97146
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/XDesktopInternal.idl | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index aacbe14805d3..24fb6e392ef4 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2603,7 +2603,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/frame,\ XControllerBorder \ XDesktop \ XDesktop2 \ - XDesktopInternal \ XDesktopTask \ XDispatch \ XDispatchHelper \ diff --git a/offapi/com/sun/star/frame/XDesktopInternal.idl b/offapi/com/sun/star/frame/XDesktopInternal.idl deleted file mode 100644 index 85dcad92dd3c..000000000000 --- a/offapi/com/sun/star/frame/XDesktopInternal.idl +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ -/* - * 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 __com_sun_star_frame_XDesktopInternal_idl__ -#define __com_sun_star_frame_XDesktopInternal_idl__ - -module com { module sun { module star { module frame { - -/** - * @internal - */ -interface XDesktopInternal -{ - /** clean up XDesktop instances after termination, when quit from Application::Execute - */ - void shutdown(); -}; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |