diff options
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
| -rw-r--r-- | offapi/com/sun/star/frame/Desktop.idl | 34 | ||||
| -rw-r--r-- | offapi/com/sun/star/frame/XDesktop2.idl | 94 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 7439872 -> 7440384 bytes |
4 files changed, 98 insertions, 33 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 4ae182e80eb0..56e5f4811ba8 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -123,6 +123,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runti )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ AutoRecovery \ + Desktop \ DispatchHelper \ DispatchRecorderSupplier \ DocumentTemplates \ @@ -829,7 +830,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ ContentHandler \ ContentHandlerFactory \ Controller \ - Desktop \ DesktopTask \ DesktopTasks \ DispatchProvider \ @@ -2480,6 +2480,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XController2 \ XControllerBorder \ XDesktop \ + XDesktop2 \ XDesktopTask \ XDispatch \ XDispatchHelper \ diff --git a/offapi/com/sun/star/frame/Desktop.idl b/offapi/com/sun/star/frame/Desktop.idl index d7a91c9009bb..c1a1c04c094a 100644 --- a/offapi/com/sun/star/frame/Desktop.idl +++ b/offapi/com/sun/star/frame/Desktop.idl @@ -19,11 +19,7 @@ #ifndef __com_sun_star_frame_Desktop_idl__ #define __com_sun_star_frame_Desktop_idl__ -#include <com/sun/star/frame/Frame.idl> -#include <com/sun/star/frame/XDesktop.idl> -#include <com/sun/star/frame/XComponentLoader.idl> -#include <com/sun/star/document/XEventBroadcaster.idl> -#include <com/sun/star/beans/XPropertySet.idl> +#include <com/sun/star/frame/XDesktop2.idl> module com { module sun { module star { module frame { @@ -37,33 +33,7 @@ interfaces, it's just because these frames use task windows. </p> */ -published service Desktop -{ - /** make it possible to be the global root of different separated frame trees - - <p> - It's not a must for a frame (neither a frame tree) to be a part of this - global tree. But such outstanding frames won't be accessible by the normal - frame API. - </p> - */ - service Frame; - - /** regulate life time of desktop environment and support high level - access to components of sub frame tree - */ - interface XDesktop; - - /** supports simple API for loading components into the frame environment - */ - interface XComponentLoader; - - /** @deprecated This interface is a documentation error. It was never thought to be supported - by this service. Please use the service <type cope="com::sun::star::frame">GlobalEventBroadcaster</type> - instead of this interface. - */ - interface com::sun::star::document::XEventBroadcaster; -}; +published service Desktop : XDesktop2; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XDesktop2.idl b/offapi/com/sun/star/frame/XDesktop2.idl new file mode 100644 index 000000000000..4d81cc774185 --- /dev/null +++ b/offapi/com/sun/star/frame/XDesktop2.idl @@ -0,0 +1,94 @@ +/* -*- 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 __com_sun_star_frame_XDesktop2_idl__ +#define __com_sun_star_frame_XDesktop2_idl__ + +#include <com/sun/star/frame/XComponentLoader.idl> +#include <com/sun/star/frame/XDesktop.idl> +#include <com/sun/star/frame/XDispatchProvider.idl> +#include <com/sun/star/frame/XDispatchProviderInterception.idl> +#include <com/sun/star/frame/XFrame.idl> +#include <com/sun/star/frame/XFramesSupplier.idl> +#include <com/sun/star/task/XStatusIndicatorFactory.idl> + + +module com { module sun { module star { module frame { + +/** + @since LibreOffice 4.1 +*/ +published interface XDesktop2 +{ + /** provides access to dispatchers for the frame. + + <p> + What kind of URLs a frame accepts in the calls to <member>XDispatchProvider::queryDispatch()</member>, + and how the returned dispatcher handles dispatches is completely implementation dependent + (though of course the restrictions of <type>XDispatchProvider</type> must be met). + Frame implementations may (optionally) support special targets in the call to + <member>XDispatchProvider::queryDispatch()</member>. + Such special targets are passed as target frame name. They may, in addition, + require special frame search flags (see <type>FrameSearchFlag</type>), or, + in opposite, limit the set of allowed flags.<br> + Common special targets include: + <ul> + <li><b>_blank</b><br> is used to create a new frame when dispatching the URL.</li> + <li><b>_default</b><br> is used to recycle empty or create a new frame when dispatching the URL.</li> + <li><b>_self</b><br> forces the frame to dispatch the URL into itself. ("" means the same)</li> + <li><b>_parent</b><br> dispatches the URL into the parent frame.</li> + <li><b>_top</b><br> dispatches the URL into the top level frame, the frame where this is invoked belongs to.</li> + </ul> + </p> + + @see XDispatch + @see XFrame::findFrame() + */ + interface XDispatchProvider; + + /** supports interception mechanism for dispatched URLs + + <p> + Registered objects can intercept, suppress or reroute dispatched URLs. + If they support another interface too (<type>XInterceptorInfo</type>) + it's possible to perform it by directly calling of right interceptor without + using list of all registered ones. + </p> + */ + interface XDispatchProviderInterception; + + /** provides access to sub frames within this frame + */ + interface XFramesSupplier; + + /** regulate life time of desktop environment and support high level + access to components of sub frame tree + */ + interface XDesktop; + + /** supports simple API for loading components into the frame environment + */ + interface XComponentLoader; +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex 7df2fa7e1ba5..cebc489d5865 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb |