diff options
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/FrameControl.idl | 24 | ||||
-rw-r--r-- | offapi/com/sun/star/frame/XFrameControl.idl | 65 | ||||
-rw-r--r-- | offapi/type_reference/offapi.rdb | bin | 6822400 -> 6822400 bytes |
4 files changed, 23 insertions, 69 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 2232124d1035..747a305f1dac 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -199,7 +199,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DispatchRecorderSupplier \ DocumentTemplates \ Frame \ - FrameControl \ FrameLoaderFactory \ GlobalEventBroadcaster \ LayoutManager \ @@ -944,6 +943,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ DesktopTask \ DesktopTasks \ DispatchProvider \ + FrameControl \ FrameLoader \ FramesContainer \ PopupMenuController \ @@ -2586,7 +2586,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrame \ XFrame2 \ XFrameActionListener \ - XFrameControl \ XFrameLoader \ XFrameLoaderQuery \ XFrameSetModel \ diff --git a/offapi/com/sun/star/frame/FrameControl.idl b/offapi/com/sun/star/frame/FrameControl.idl index 692d2395dbe9..7a85e6d7f9ec 100644 --- a/offapi/com/sun/star/frame/FrameControl.idl +++ b/offapi/com/sun/star/frame/FrameControl.idl @@ -19,7 +19,8 @@ #ifndef __com_sun_star_frame_FrameControl_idl__ #define __com_sun_star_frame_FrameControl_idl__ -#include <com/sun/star/frame/XFrameControl.idl> +#include <com/sun/star/awt/UnoControl.idl> +#include <com/sun/star/beans/XPropertySet.idl> module com { module sun { module star { module frame { @@ -33,7 +34,26 @@ any UI. </p> */ -published service FrameControl : XFrameControl; +published service FrameControl +{ + /** the base service of all controls + */ + service com::sun::star::awt::UnoControl; + + /** contains the type of the component which is loaded into the frame, + or the document which implicitly specifies the type + */ + [property] string ComponentUrl; + + /** the frame held by this control + + <p> + The Frame is created if the control + is shown and the #ComponentUrl is set. + </p> + */ + [property, readonly] string Frame; +}; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XFrameControl.idl b/offapi/com/sun/star/frame/XFrameControl.idl deleted file mode 100644 index 0375f344bc28..000000000000 --- a/offapi/com/sun/star/frame/XFrameControl.idl +++ /dev/null @@ -1,65 +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 __com_sun_star_frame_XFrameControl_idl__ -#define __com_sun_star_frame_XFrameControl_idl__ - -#include <com/sun/star/awt/UnoControl.idl> -#include <com/sun/star/beans/XPropertySet.idl> -#include <com/sun/star/beans/PropertyValue.idl> -#include <com/sun/star/frame/XFrame2.idl> - - - module com { module sun { module star { module frame { - -/** - Unified interface for the FrameControl service. - This is not the complete set of interfaces this service implements, just the bare minimum - that we use internally. - - @since LibreOffice 4.2 - */ -published interface XFrameControl -{ - interface com::sun::star::awt::XControl; - - interface com::sun::star::awt::XWindow; - - /** contains the type of the component which is loaded into the frame, - or the document which implicitly specifies the type - */ - [attribute] string ComponentURL; - - /** the frame held by this control - - <p> - The Frame is created if the control - is shown and the #ComponentUrl is set. - </p> - */ - [attribute] com::sun::star::frame::XFrame2 Frame; - - [attribute] sequence< ::com::sun::star::beans::PropertyValue > LoaderArguments; -}; - - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/offapi.rdb b/offapi/type_reference/offapi.rdb Binary files differindex 667b727f7f44..fd83b2292aa3 100644 --- a/offapi/type_reference/offapi.rdb +++ b/offapi/type_reference/offapi.rdb |