diff options
author | Noel Grandin <noel@peralex.com> | 2012-12-11 11:27:08 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2012-12-13 05:20:58 +0200 |
commit | b552f521f6bbf917ae41ccfcddeb498c75c824e3 (patch) | |
tree | ae21fbb700814e8b31bca384f47f68b0a5e71145 /offapi/com/sun | |
parent | bb8900baaaaa489442a5bd805bb42d43cd6fc152 (diff) |
fdo#46808, Adapt ui::UIElementFactoryManager UNO service to new style
Required creating a new merged interface.
Change-Id: I12be54e7e4c0614a31a04715342aa244d1687c42
Diffstat (limited to 'offapi/com/sun')
-rw-r--r-- | offapi/com/sun/star/ui/UIElementFactoryManager.idl | 26 | ||||
-rw-r--r-- | offapi/com/sun/star/ui/XUIElementFactoryManager.idl | 57 |
2 files changed, 61 insertions, 22 deletions
diff --git a/offapi/com/sun/star/ui/UIElementFactoryManager.idl b/offapi/com/sun/star/ui/UIElementFactoryManager.idl index cf19f6c00c37..7ff3746f584a 100644 --- a/offapi/com/sun/star/ui/UIElementFactoryManager.idl +++ b/offapi/com/sun/star/ui/UIElementFactoryManager.idl @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __com_sun_star_ui_UIElementFactory_idl__ -#define __com_sun_star_ui_UIElementFactory_idl__ +#ifndef __com_sun_star_ui_UIElementFactoryManager_idl__ +#define __com_sun_star_ui_UIElementFactoryManager_idl__ -#include <com/sun/star/lang/XMultiComponentFactory.idl> -#include <com/sun/star/ui/XUIElementFactoryRegistration.idl> +#include <com/sun/star/ui/XUIElementFactoryManager.idl> module com { module sun { module star { module ui { @@ -37,24 +36,7 @@ module com { module sun { module star { module ui { @since OOo 2.0 */ -service UIElementFactoryManager -{ - /** provides a function to create new instances of user interface elements. - - <p> - A user interface element factory manager is also a user interface element factory. It - retrieves the responsible user interface element factory from the provided arguments and passes - the arguments to it. - - see @XUIElementFactory - </p> - */ - interface XUIElementFactory; - - /** provides functions to query, retrieve, register and deregister user interface element factories. - */ - interface XUIElementFactoryRegistration; -}; +service UIElementFactoryManager : XUIElementFactoryManager; }; }; }; }; diff --git a/offapi/com/sun/star/ui/XUIElementFactoryManager.idl b/offapi/com/sun/star/ui/XUIElementFactoryManager.idl new file mode 100644 index 000000000000..15ec523d3c51 --- /dev/null +++ b/offapi/com/sun/star/ui/XUIElementFactoryManager.idl @@ -0,0 +1,57 @@ +/* -*- 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_XUIElementFactoryManager_idl__ +#define __com_sun_star_ui_XUIElementFactoryManager_idl__ + +#include <com/sun/star/lang/XMultiComponentFactory.idl> +#include <com/sun/star/ui/XUIElementFactoryRegistration.idl> + + +module com { module sun { module star { module ui { + + +/** Provides a unified interface for the new-style service XUIElementFactoryManager. + + @since LibreOffice 4.1 +*/ +interface XUIElementFactoryManager +{ + /** provides a function to create new instances of user interface elements. + + <p> + A user interface element factory manager is also a user interface element factory. It + retrieves the responsible user interface element factory from the provided arguments and passes + the arguments to it. + + see @XUIElementFactory + </p> + */ + interface XUIElementFactory; + + /** provides functions to query, retrieve, register and deregister user interface element factories. + */ + interface XUIElementFactoryRegistration; +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |