diff options
author | Noel Grandin <noel@peralex.com> | 2013-05-27 14:52:39 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-05-28 08:10:23 +0200 |
commit | 8f3cec9d7a50f33c7be5191656720e463712dd83 (patch) | |
tree | ffc45e8944ff407fef79f6997ea610877d7f2e2c /offapi/com/sun | |
parent | aff5c4d76b7a876e9ce9e0b70bb52864dd65be24 (diff) |
fdo#46808, Convert ui:*AcceleratorConfiguration to new style
The services already existed, they just needed IDL files.
API CHANGE:
The return type of XUIConfigurationManager#getShortcutManager()
is now XAcceleratorConfiguration instead of XInterface.
This should not be a problem because XUIConfigurationManager is
unpublished and the client code was relying on the service
returning that type.
Change-Id: I399fe35de3394b02a4166b75eb7ff93b28be8bef
Diffstat (limited to 'offapi/com/sun')
3 files changed, 81 insertions, 1 deletions
diff --git a/offapi/com/sun/star/ui/DocumentAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/DocumentAcceleratorConfiguration.idl new file mode 100644 index 000000000000..45d85b7d62b0 --- /dev/null +++ b/offapi/com/sun/star/ui/DocumentAcceleratorConfiguration.idl @@ -0,0 +1,40 @@ +/* -*- 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_DocumentAcceleratorConfiguration_idl__ +#define __com_sun_star_ui_DocumentAcceleratorConfiguration_idl__ + +#include <com/sun/star/ui/XAcceleratorConfiguration.idl> +#include <com/sun/star/embed/XStorage.idl> + +module com { module sun { module star { module ui { + +/** + + @since LibreOffice 4.2 +*/ +service DocumentAcceleratorConfiguration : XAcceleratorConfiguration +{ + createWithDocumentRoot([in] com::sun::star::embed::XStorage DocumentRoot); +}; + +}; }; }; }; // com.sun.star + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/ui/ModuleAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/ModuleAcceleratorConfiguration.idl new file mode 100644 index 000000000000..532e93fb0c5c --- /dev/null +++ b/offapi/com/sun/star/ui/ModuleAcceleratorConfiguration.idl @@ -0,0 +1,39 @@ +/* -*- 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_ModuleAcceleratorConfiguration_idl__ +#define __com_sun_star_ui_ModuleAcceleratorConfiguration_idl__ + +#include <com/sun/star/ui/XAcceleratorConfiguration.idl> + +module com { module sun { module star { module ui { + +/** + + @since LibreOffice 4.2 +*/ +service ModuleAcceleratorConfiguration : XAcceleratorConfiguration +{ + createWithModuleIdentifier([in] string ModuleIdentifier); +}; + +}; }; }; }; // com.sun.star + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/ui/XUIConfigurationManager.idl b/offapi/com/sun/star/ui/XUIConfigurationManager.idl index 45b906f11779..6d58c0eab9bd 100644 --- a/offapi/com/sun/star/ui/XUIConfigurationManager.idl +++ b/offapi/com/sun/star/ui/XUIConfigurationManager.idl @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XPropertySet.idl> #include <com/sun/star/beans/PropertyValue.idl> #include <com/sun/star/ui/XUIConfigurationListener.idl> +#include <com/sun/star/ui/XAcceleratorConfiguration.idl> #include <com/sun/star/container/ElementExistException.idl> #include <com/sun/star/container/NoSuchElementException.idl> #include <com/sun/star/lang/IllegalArgumentException.idl> @@ -216,7 +217,7 @@ interface XUIConfigurationManager : ::com::sun::star::uno::XInterface @return the short cut manager of the user interface configuration manager. */ - com::sun::star::uno::XInterface getShortCutManager(); + com::sun::star::ui::XAcceleratorConfiguration getShortCutManager(); /** retrieves the events manager from the user interface configuration manager. |