diff options
author | Noel Grandin <noel@peralex.com> | 2012-10-26 14:24:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-30 11:02:39 +0100 |
commit | 43d9f35c2665e55cfb5ee911a554ef71933ad4d1 (patch) | |
tree | d3b5d69db549ae13f0bc2a29c6905fe4235f4737 /offapi | |
parent | Rationale for webdav-neon vs. webdav (diff) | |
download | core-43d9f35c2665e55cfb5ee911a554ef71933ad4d1.tar.gz core-43d9f35c2665e55cfb5ee911a554ef71933ad4d1.zip |
fdo#46808, Adapt linguistic2::LinguServiceManager UNO service to new style
Create a merged XLinguServiceManager2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Change-Id: I297bada1066cd74809108641b56ee4d5898112ec
Diffstat (limited to 'offapi')
-rw-r--r-- | offapi/UnoApi_offapi.mk | 3 | ||||
-rw-r--r-- | offapi/com/sun/star/linguistic2/LinguServiceManager.idl | 13 | ||||
-rw-r--r-- | offapi/com/sun/star/linguistic2/XLinguServiceManager2.idl | 46 | ||||
-rw-r--r-- | offapi/type_reference/types.rdb | bin | 7655424 -> 7655424 bytes |
4 files changed, 50 insertions, 12 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index b1b5e2da2a9f..f573d5ba2966 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -158,6 +158,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ LanguageGuessing \ + LinguServiceManager \ Proofreader \ ProofreadingIterator \ )) @@ -890,7 +891,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/linguis HangulHanjaConversionDictionary \ Hyphenator \ LinguProperties \ - LinguServiceManager \ SpellChecker \ Thesaurus \ )) @@ -2762,6 +2762,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/linguistic2,\ XLinguServiceEventBroadcaster \ XLinguServiceEventListener \ XLinguServiceManager \ + XLinguServiceManager2 \ XMeaning \ XPossibleHyphens \ XProofreader \ diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl index efdeb0d7ae1a..fb2d71849208 100644 --- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl +++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl @@ -19,23 +19,14 @@ #ifndef __com_sun_star_linguistic2_LinguServiceManager_idl__ #define __com_sun_star_linguistic2_LinguServiceManager_idl__ -#include <com/sun/star/lang/XComponent.idl> - +#include <com/sun/star/linguistic2/XLinguServiceManager2.idl> module com { module sun { module star { module linguistic2 { - published interface XLinguServiceManager; - published interface XAvailableLocales; - /** offers linguistic functionality. Is to be used to access spell checker, hyphenator and thesaurus. */ -published service LinguServiceManager -{ - interface com::sun::star::linguistic2::XLinguServiceManager; - interface com::sun::star::linguistic2::XAvailableLocales; - interface com::sun::star::lang::XComponent; -}; +published service LinguServiceManager : XLinguServiceManager2; }; }; }; }; diff --git a/offapi/com/sun/star/linguistic2/XLinguServiceManager2.idl b/offapi/com/sun/star/linguistic2/XLinguServiceManager2.idl new file mode 100644 index 000000000000..61a0c7bdfbbb --- /dev/null +++ b/offapi/com/sun/star/linguistic2/XLinguServiceManager2.idl @@ -0,0 +1,46 @@ +/* -*- 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_linguistic2_XLinguServiceManager2_idl__ +#define __com_sun_star_linguistic2_XLinguServiceManager2_idl__ + +#include <com/sun/star/lang/XComponent.idl> +#include <com/sun/star/linguistic2/XLinguServiceManager.idl> +#include <com/sun/star/linguistic2/XAvailableLocales.idl> + + +module com { module sun { module star { module linguistic2 { + +/** + Provides a unified interface for the LinguServiceManager service to implement. + + @since LibreOffice 3.7 +*/ +published interface XLinguServiceManager2 +{ + interface com::sun::star::linguistic2::XLinguServiceManager; + interface com::sun::star::linguistic2::XAvailableLocales; + interface com::sun::star::lang::XComponent; +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex 8a3c658466ab..14cba0b4a5c3 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb |