diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-12-17 01:14:30 -0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-18 10:17:14 +0100 |
commit | 6cd3118b6370a0314e58692e08b68c4dcb0f922a (patch) | |
tree | dae1a4f84e21716bd450593719e168d8a3bb2cac /i18npool/inc | |
parent | fdo#72790 Clear interop grab bag name, once grab bag is cleared. (diff) | |
download | core-6cd3118b6370a0314e58692e08b68c4dcb0f922a.tar.gz core-6cd3118b6370a0314e58692e08b68c4dcb0f922a.zip |
fdo#54938: Convert i18npool to use cppu::supportsService
Change-Id: I9acc496cd95c8362972fa0c41d35b77fc0715aba
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'i18npool/inc')
-rw-r--r-- | i18npool/inc/collator_unicode.hxx | 5 | ||||
-rw-r--r-- | i18npool/inc/transliteration_commonclass.hxx | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index b7a0a74ce0f8..1390d79df65c 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -21,7 +21,8 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/XCollator.hpp> -#include <cppuhelper/implbase1.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/implbase2.hxx> #include <osl/module.h> #include <unicode/tblcoll.h> @@ -32,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace i18n { -class Collator_Unicode : public cppu::WeakImplHelper1 < XCollator > +class Collator_Unicode : public cppu::WeakImplHelper2 < XCollator, com::sun::star::lang::XServiceInfo > { public: // Constructors diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 6e909eaad4f5..43634578c81f 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -21,13 +21,17 @@ #include <com/sun/star/i18n/XExtendedTransliteration.hpp> #include <com/sun/star/i18n/TransliterationType.hpp> -#include <cppuhelper/implbase1.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <cppuhelper/implbase2.hxx> #include <rtl/ustrbuf.h> #include <rtl/ustring.hxx> namespace com { namespace sun { namespace star { namespace i18n { -class transliteration_commonclass : public cppu::WeakImplHelper1< com::sun::star::i18n::XExtendedTransliteration > +class transliteration_commonclass : public cppu::WeakImplHelper2< + com::sun::star::i18n::XExtendedTransliteration, + com::sun::star::lang::XServiceInfo + > { public: transliteration_commonclass(); |