From 95ec16b513c979fd78d2f11d23157a4b8819d848 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 27 May 2013 12:58:50 +0200 Subject: fdo#46808, Convert frame::LayoutManager service to new sty;e Change-Id: I46c3950aee336548d6e0acc6a7d1da655c158175 --- offapi/UnoApi_offapi.mk | 3 +- offapi/com/sun/star/frame/LayoutManager.idl | 53 +--------------- offapi/com/sun/star/frame/XLayoutManager2.idl | 88 +++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 52 deletions(-) create mode 100644 offapi/com/sun/star/frame/XLayoutManager2.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index a0488b127c4a..12ee8f17da27 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -194,6 +194,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DocumentTemplates \ Frame \ GlobalEventBroadcaster \ + LayoutManager \ MediaTypeDetectionHelper \ ModuleManager \ SessionListener \ @@ -939,7 +940,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ FrameLoader \ FrameLoaderFactory \ FramesContainer \ - LayoutManager \ PopupMenuController \ PopupMenuControllerFactory \ ProtocolHandler \ @@ -2597,6 +2597,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XGlobalEventBroadcaster \ XInterceptorInfo \ XLayoutManager \ + XLayoutManager2 \ XLayoutManagerEventBroadcaster \ XLayoutManagerListener \ XLoadEventListener \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index b89743dd9b28..c688e69bf358 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -20,12 +20,7 @@ #ifndef __com_sun_star_frame_LayoutManager_idl__ #define __com_sun_star_frame_LayoutManager_idl__ -#include -#include -#include -#include -#include -#include +#include module com { module sun { module star { module frame { @@ -44,51 +39,7 @@ @since OOo 2.0 */ -service LayoutManager -{ - /** central interface to query for, create, destroy and manipulate user - interface elements which are bound to a frame. - - @see ::com::sun::star::frame::XLayoutManager; - */ - interface ::com::sun::star::frame::XLayoutManager; - - /** notification interface to receive status information about the state - of the connected frame. - -

- E.g., you can receive events of instantiation/destruction and - activation/deactivation of a frame. -

- - @see XFrame::addFrameActionListener() - @see XFrame::removeFrameActionListener() - */ - interface ::com::sun::star::frame::XFrameActionListener; - - /** notification interface to receive change messages of user interface - elements which are part of the layout manager. - -

- E.g., you can receive events of insertion/replacing and - removing of settings data of user interface elements. -

- - @see com::sun::star::ui::XUIConfiguration - */ - interface ::com::sun::star::ui::XUIConfigurationListener; - - /** provides functions to merge menus for inplace editing of components - inside OpenOffice.org. - */ - interface ::com::sun::star::frame::XMenuBarMergingAcceptor; - - /** registers listeners that want to receive layout manager - events. - */ - [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; - -}; +service LayoutManager : XLayoutManager2; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XLayoutManager2.idl b/offapi/com/sun/star/frame/XLayoutManager2.idl new file mode 100644 index 000000000000..2e926aeabb26 --- /dev/null +++ b/offapi/com/sun/star/frame/XLayoutManager2.idl @@ -0,0 +1,88 @@ +/* -*- 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_XLayoutManager2_idl__ +#define __com_sun_star_frame_XLayoutManager2_idl__ + +#include +#include +#include +#include +#include +#include + + + module com { module sun { module star { module frame { + +/** + Unified interface for LayoutManager service. + + @since LibreOffice 4.2 +*/ +interface XLayoutManager2 +{ + /** central interface to query for, create, destroy and manipulate user + interface elements which are bound to a frame. + + @see ::com::sun::star::frame::XLayoutManager; + */ + interface ::com::sun::star::frame::XLayoutManager; + + /** notification interface to receive status information about the state + of the connected frame. + +

+ E.g., you can receive events of instantiation/destruction and + activation/deactivation of a frame. +

+ + @see XFrame::addFrameActionListener() + @see XFrame::removeFrameActionListener() + */ + interface ::com::sun::star::frame::XFrameActionListener; + + /** notification interface to receive change messages of user interface + elements which are part of the layout manager. + +

+ E.g., you can receive events of insertion/replacing and + removing of settings data of user interface elements. +

+ + @see com::sun::star::ui::XUIConfiguration + */ + interface ::com::sun::star::ui::XUIConfigurationListener; + + /** provides functions to merge menus for inplace editing of components + inside OpenOffice.org. + */ + interface ::com::sun::star::frame::XMenuBarMergingAcceptor; + + /** registers listeners that want to receive layout manager + events. + */ + interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; + +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit