diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-20 18:40:30 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-21 06:28:42 +0000 |
| commit | 5a2d6bf3a94f127307d6a9464033b2226508ff38 (patch) | |
| tree | a3233fa3c46bc919647f6affc491e32570c9af7d /include/linguistic | |
| parent | 4385e2d3c42b54390cb27546f7fa1a19fca8e8c5 (diff) | |
linguistic: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I7a4df40d680ed9e10daacd01657df9666b8cc524
Reviewed-on: https://gerrit.libreoffice.org/17868
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/linguistic')
| -rw-r--r-- | include/linguistic/hyphdta.hxx | 6 | ||||
| -rw-r--r-- | include/linguistic/lngprophelp.hxx | 4 | ||||
| -rw-r--r-- | include/linguistic/misc.hxx | 4 | ||||
| -rw-r--r-- | include/linguistic/spelldta.hxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/linguistic/hyphdta.hxx b/include/linguistic/hyphdta.hxx index c080f47677ae..14768ca9700b 100644 --- a/include/linguistic/hyphdta.hxx +++ b/include/linguistic/hyphdta.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <com/sun/star/linguistic2/XPossibleHyphens.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <linguistic/lngdllapi.h> namespace linguistic { class HyphenatedWord : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XHyphenatedWord > @@ -76,7 +76,7 @@ public: class PossibleHyphens : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XPossibleHyphens > diff --git a/include/linguistic/lngprophelp.hxx b/include/linguistic/lngprophelp.hxx index ce618d448ac5..75780566766c 100644 --- a/include/linguistic/lngprophelp.hxx +++ b/include/linguistic/lngprophelp.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_LNGPROPHELP_HXX #define INCLUDED_LINGUISTIC_LNGPROPHELP_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/PropertyValues.hpp> @@ -49,7 +49,7 @@ namespace linguistic #define AE_SPELLCHECKER 1 #define AE_HYPHENATOR 2 -typedef cppu::WeakImplHelper2 +typedef cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::linguistic2::XLinguServiceEventBroadcaster diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx index 56e7cb2fb6d8..04296f12a4b2 100644 --- a/include/linguistic/misc.hxx +++ b/include/linguistic/misc.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <com/sun/star/linguistic2/XLinguProperties.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <unotools/pathoptions.hxx> #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> @@ -178,7 +178,7 @@ LNG_DLLPUBLIC bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::c // (ie the Desktop) is about to terminate class AppExitListener : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::frame::XTerminateListener > diff --git a/include/linguistic/spelldta.hxx b/include/linguistic/spelldta.hxx index 9bdfe8334516..02257297dc17 100644 --- a/include/linguistic/spelldta.hxx +++ b/include/linguistic/spelldta.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/linguistic2/XSpellAlternatives.hpp> #include <com/sun/star/linguistic2/XSetSpellAlternatives.hpp> #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <linguistic/lngdllapi.h> #include <boost/noncopyable.hpp> @@ -61,7 +61,7 @@ void SearchSimilarText( const OUString &rText, sal_Int16 nLanguage, class SpellAlternatives - : public cppu::WeakImplHelper2 + : public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XSpellAlternatives, ::com::sun::star::linguistic2::XSetSpellAlternatives |