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 /linguistic | |
| parent | 273ee9838cb87d6cf910a92969592709eba650f9 (diff) | |
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 'linguistic')
| -rw-r--r-- | linguistic/inc/linguistic/misc.hxx | 1 | ||||
| -rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 2 | ||||
| -rw-r--r-- | linguistic/source/lngsvcmgr.hxx | 12 |
3 files changed, 5 insertions, 10 deletions
diff --git a/linguistic/inc/linguistic/misc.hxx b/linguistic/inc/linguistic/misc.hxx index 0bf1c5cc00a3..984f0fee21ed 100644 --- a/linguistic/inc/linguistic/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx @@ -57,7 +57,6 @@ class LocaleDataWrapper; #define SN_SPELLCHECKER "com.sun.star.linguistic2.SpellChecker" #define SN_HYPHENATOR "com.sun.star.linguistic2.Hyphenator" #define SN_THESAURUS "com.sun.star.linguistic2.Thesaurus" -#define SN_LINGU_SERVCICE_MANAGER "com.sun.star.linguistic2.LinguServiceManager" #define SN_LINGU_PROPERTIES "com.sun.star.linguistic2.LinguProperties" #define SN_DICTIONARY_LIST "com.sun.star.linguistic2.DictionaryList" #define SN_DESKTOP "com.sun.star.frame.Desktop" diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 0e9a6e8a44f6..bef4892a8b86 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -2111,7 +2111,7 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static() osl::MutexGuard aGuard( GetLinguMutex() ); uno::Sequence< OUString > aSNS( 1 ); // more than 1 service possible - aSNS.getArray()[0] = SN_LINGU_SERVCICE_MANAGER; + aSNS.getArray()[0] = "com.sun.star.linguistic2.LinguServiceManager"; return aSNS; } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 05f93b97d01e..91de15e7f5c7 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -21,15 +21,13 @@ #define _LINGUISTIC_LNGSVCMGR_HXX_ #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type -#include <cppuhelper/implbase5.hxx> // helper for implementations +#include <cppuhelper/implbase3.hxx> // helper for implementations #include <cppuhelper/interfacecontainer.h> //OMultiTypeInterfaceContainerHelper #include <com/sun/star/uno/Reference.h> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/linguistic2/XLinguServiceManager.hpp> -#include <com/sun/star/linguistic2/XAvailableLocales.hpp> +#include <com/sun/star/linguistic2/XLinguServiceManager2.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <unotools/configitem.hxx> @@ -57,11 +55,9 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class LngSvcMgr : - public cppu::WeakImplHelper5 + public cppu::WeakImplHelper3 < - com::sun::star::linguistic2::XLinguServiceManager, - com::sun::star::linguistic2::XAvailableLocales, - com::sun::star::lang::XComponent, + com::sun::star::linguistic2::XLinguServiceManager2, com::sun::star::lang::XServiceInfo, com::sun::star::util::XModifyListener >, |