From 6a1c29d7efd505346d4b43ee2b7080e8d769301e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 5 Sep 2012 22:46:40 +0200 Subject: offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription: The service implementation used "com.sun.star.frame.UICommandDescription" since forever, so the IDL file was essentially wrong documentation. But since 7a464263cc5c2ca2b7128734ff4860e02d662818 converted the service to new-style, it cannot be instantated any more and e.g. clicking on Tools->Customize crashes. (Adapting the implementation instead would be an incompatible change.) Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5 --- offapi/UnoApi_offapi.mk | 2 +- offapi/com/sun/star/frame/UICommandDescription.idl | 56 ++++++++++++++++++++++ offapi/com/sun/star/ui/UICommandDescription.idl | 56 ---------------------- 3 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 offapi/com/sun/star/frame/UICommandDescription.idl delete mode 100644 offapi/com/sun/star/ui/UICommandDescription.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 8a56c3b87939..db5f8ccec969 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -135,6 +135,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ DocumentTemplates \ MediaTypeDetectionHelper \ ModuleManager \ + UICommandDescription \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\ GraphicObject \ @@ -290,7 +291,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\ GlobalAcceleratorConfiguration \ ModuleUIConfigurationManagerSupplier \ - UICommandDescription \ WindowContentFactory \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/dialogs,\ diff --git a/offapi/com/sun/star/frame/UICommandDescription.idl b/offapi/com/sun/star/frame/UICommandDescription.idl new file mode 100644 index 000000000000..1f2d3cd1ab71 --- /dev/null +++ b/offapi/com/sun/star/frame/UICommandDescription.idl @@ -0,0 +1,56 @@ +/* -*- 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_UICommandDescription_idl__ +#define __com_sun_star_frame_UICommandDescription_idl__ + +#include + + +module com { module sun { module star { module frame { + + +/** a service which provides information about user interface commands of modules. + +

+ OpenOffice.org has an amount of commands that can be used by user interface + elements. This service provides access to the user interface commands that + are part of OpenOffice.org modules, like Writer or Calc. +

+ + @since OOo 2.0 + + Provides access to user interface commands of the installed modules. + +

+ To access the user interface command description of a module, a unique module specifier + must be provided to XNameAccess::getByName() function. + The module specifier can be retrieved from the ModuleManager + service. The interface provides references to ModuleUICommandDescription. +

+ + @see com::sun::star::frame::ModuleManager +*/ +service UICommandDescription : com::sun::star::container::XNameAccess; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl deleted file mode 100644 index c5b8b76f554d..000000000000 --- a/offapi/com/sun/star/ui/UICommandDescription.idl +++ /dev/null @@ -1,56 +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_ui_UICommandDescription_idl__ -#define __com_sun_star_ui_UICommandDescription_idl__ - -#include - - -module com { module sun { module star { module ui { - - -/** a service which provides information about user interface commands of modules. - -

- OpenOffice.org has an amount of commands that can be used by user interface - elements. This service provides access to the user interface commands that - are part of OpenOffice.org modules, like Writer or Calc. -

- - @since OOo 2.0 - - Provides access to user interface commands of the installed modules. - -

- To access the user interface command description of a module, a unique module specifier - must be provided to XNameAccess::getByName() function. - The module specifier can be retrieved from the ModuleManager - service. The interface provides references to ModuleUICommandDescription. -

- - @see com::sun::star::frame::ModuleManager -*/ -service UICommandDescription : com::sun::star::container::XNameAccess; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3