diff options
author | Noel Grandin <noel@peralex.com> | 2013-02-26 16:24:53 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-03-07 08:23:38 +0200 |
commit | cd8ea20aa4b85128956a79c80f7953d30e99e802 (patch) | |
tree | 2ec962196db84427e97bbc9bb73f9566d70b6fd1 /offapi | |
parent | fix spelling (diff) | |
download | core-cd8ea20aa4b85128956a79c80f7953d30e99e802.tar.gz core-cd8ea20aa4b85128956a79c80f7953d30e99e802.zip |
fdo#46808, Convert ui::UIConfigurationManager to new-style
Change-Id: I62c37eb6d0e0b2a681a84e1fa0067d0a9f967cf2
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/ui/UIConfigurationManager.idl | 38 | ||||
-rw-r--r-- | offapi/com/sun/star/ui/XUIConfigurationManager2.idl | 70 |
3 files changed, 74 insertions, 37 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0f91b61ed048..d42358832600 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -348,6 +348,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ AddressBookSourceDialog \ GlobalAcceleratorConfiguration \ ModuleUIConfigurationManagerSupplier \ + UIConfigurationManager \ UIElementFactoryManager \ WindowContentFactory \ WindowContentFactoryManager \ @@ -1484,7 +1485,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/ui,\ ModuleUIConfigurationManager \ ModuleWindowStateConfiguration \ UICategoryDescription \ - UIConfigurationManager \ UIElement \ UIElementFactory \ UIElementSettings \ @@ -3905,6 +3905,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/ui,\ XUIConfiguration \ XUIConfigurationListener \ XUIConfigurationManager \ + XUIConfigurationManager2 \ XUIConfigurationManagerSupplier \ XUIConfigurationPersistence \ XUIConfigurationStorage \ diff --git a/offapi/com/sun/star/ui/UIConfigurationManager.idl b/offapi/com/sun/star/ui/UIConfigurationManager.idl index 1e581c4fde96..9b5fa98240af 100644 --- a/offapi/com/sun/star/ui/UIConfigurationManager.idl +++ b/offapi/com/sun/star/ui/UIConfigurationManager.idl @@ -19,11 +19,7 @@ #ifndef __com_sun_star_ui_UIConfigurationManager_idl__ #define __com_sun_star_ui_UIConfigurationManager_idl__ -#include <com/sun/star/lang/XComponent.idl> -#include <com/sun/star/ui/XUIConfiguration.idl> -#include <com/sun/star/ui/XUIConfigurationManager.idl> -#include <com/sun/star/ui/XUIConfigurationPersistence.idl> -#include <com/sun/star/ui/XUIConfigurationStorage.idl> +#include <com/sun/star/ui/XUIConfigurationManager2.idl> module com { module sun { module star { module ui { @@ -33,37 +29,7 @@ module com { module sun { module star { module ui { @since OOo 2.0 */ -service UIConfigurationManager -{ - /** provides access to set a storage and to check if a storage has been - associated to the user interface configuration manager. - */ - interface com::sun::star::ui::XUIConfigurationStorage; - - /** provides access to persistence functions to load/store user interface configuration - data from a storage. - */ - interface com::sun::star::ui::XUIConfigurationPersistence; - - /** provides functions to change, insert and remove user interface elements - from a user interface configuration manager. - */ - interface com::sun::star::ui::XUIConfigurationManager; - - /** provides functions to add and remove listeners for changes within a user - interface configuration manager. - */ - interface com::sun::star::ui::XUIConfiguration; - - /** allows controlling or observing the lifetime of a user interface configuration manager - instance. - - <p>The owner of the object may dispose of this object using - <member scope="com::sun::star::lang">XComponent::dispose()</member>. - </p> - */ - interface ::com::sun::star::lang::XComponent; -}; +service UIConfigurationManager : XUIConfigurationManager2; }; }; }; }; diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager2.idl b/offapi/com/sun/star/ui/XUIConfigurationManager2.idl new file mode 100644 index 000000000000..f116eec0f53a --- /dev/null +++ b/offapi/com/sun/star/ui/XUIConfigurationManager2.idl @@ -0,0 +1,70 @@ +/* -*- 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_ui_XUIConfigurationManager2_idl__ +#define __com_sun_star_ui_XUIConfigurationManager2_idl__ + +#include <com/sun/star/lang/XComponent.idl> +#include <com/sun/star/ui/XUIConfiguration.idl> +#include <com/sun/star/ui/XUIConfigurationManager.idl> +#include <com/sun/star/ui/XUIConfigurationPersistence.idl> +#include <com/sun/star/ui/XUIConfigurationStorage.idl> + +module com { module sun { module star { module ui { + +/** + @since LibreOffice 4.1 +*/ +interface XUIConfigurationManager2 +{ + /** provides access to set a storage and to check if a storage has been + associated to the user interface configuration manager. + */ + interface com::sun::star::ui::XUIConfigurationStorage; + + /** provides access to persistence functions to load/store user interface configuration + data from a storage. + */ + interface com::sun::star::ui::XUIConfigurationPersistence; + + /** provides functions to change, insert and remove user interface elements + from a user interface configuration manager. + */ + interface com::sun::star::ui::XUIConfigurationManager; + + /** provides functions to add and remove listeners for changes within a user + interface configuration manager. + */ + interface com::sun::star::ui::XUIConfiguration; + + /** allows controlling or observing the lifetime of a user interface configuration manager + instance. + + <p>The owner of the object may dispose of this object using + <member scope="com::sun::star::lang">XComponent::dispose()</member>. + </p> + */ + interface ::com::sun::star::lang::XComponent; +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |