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 /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 'linguistic')
-rw-r--r-- | linguistic/inc/iprcache.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/convdic.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/convdiclist.cxx | 3 | ||||
-rw-r--r-- | linguistic/source/convdiclist.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/convdicxml.hxx | 1 | ||||
-rw-r--r-- | linguistic/source/dicimp.hxx | 7 | ||||
-rw-r--r-- | linguistic/source/dlistimp.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/dlistimp.hxx | 5 | ||||
-rw-r--r-- | linguistic/source/gciterator.cxx | 1 | ||||
-rw-r--r-- | linguistic/source/gciterator.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/hhconvdic.hxx | 1 | ||||
-rw-r--r-- | linguistic/source/hyphdsp.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/lngopt.cxx | 2 | ||||
-rw-r--r-- | linguistic/source/lngopt.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/lngsvcmgr.cxx | 3 | ||||
-rw-r--r-- | linguistic/source/lngsvcmgr.hxx | 4 | ||||
-rw-r--r-- | linguistic/source/spelldsp.hxx | 6 | ||||
-rw-r--r-- | linguistic/source/thesdsp.hxx | 5 | ||||
-rw-r--r-- | linguistic/workben/sprophelp.hxx | 4 | ||||
-rw-r--r-- | linguistic/workben/sspellimp.hxx | 5 |
20 files changed, 32 insertions, 41 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 855fde7998dd..5e56a13db643 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_INC_IPRCACHE_HXX #define INCLUDED_LINGUISTIC_INC_IPRCACHE_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/document/XEventListener.hpp> @@ -51,7 +51,7 @@ protected: class FlushListener : - public cppu::WeakImplHelper2 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XDictionaryListEventListener, ::com::sun::star::beans::XPropertyChangeListener diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 8eae426c50b5..448c0532abcd 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/linguistic2/XConversionPropertyType.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <memory> @@ -67,7 +67,7 @@ typedef std::unordered_multimap< OUString, sal_Int16, class ConvDic : - public ::cppu::WeakImplHelper4 + public ::cppu::WeakImplHelper < ::com::sun::star::linguistic2::XConversionDictionary, ::com::sun::star::linguistic2::XConversionPropertyType, diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 380703b61bfe..b89ca49e4b46 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/XFlushable.hpp> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/instance.hxx> @@ -82,7 +83,7 @@ OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectory } class ConvDicNameContainer : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::container::XNameContainer >, diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index f9e4cf383b63..8945e85ed5f0 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include "linguistic/misc.hxx" @@ -34,7 +34,7 @@ class ConvDicNameContainer; class ConvDicList : - public cppu::WeakImplHelper3 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XConversionDictionaryList, ::com::sun::star::lang::XComponent, diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 382813015816..c5ce97a0da1b 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -28,7 +28,6 @@ #include <comphelper/processfactory.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlimp.hxx> -#include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> #include <rtl/ustring.hxx> #include "linguistic/misc.hxx" diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index 9a02ab32a5cb..c871cee7517d 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -24,8 +24,7 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <tools/stream.hxx> @@ -37,7 +36,7 @@ sal_Int16 ReadDicVersion( SvStreamPtr &rpStream, sal_uInt16 &nLng, bool &bNeg ); class DictionaryNeo : - public ::cppu::WeakImplHelper2 + public ::cppu::WeakImplHelper < ::com::sun::star::linguistic2::XDictionary, ::com::sun::star::frame::XStorable @@ -179,7 +178,7 @@ public: class DicEntry : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XDictionaryEntry > diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 38bbf39443fe..d5d22286a256 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -60,7 +60,7 @@ static void AddUserData( const uno::Reference< XDictionary > &rDic ); class DicEvtListenerHelper : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < XDictionaryEventListener > diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index dd4869d068db..78a772950eab 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -24,8 +24,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <vector> @@ -37,7 +36,7 @@ class DicEvtListenerHelper; class DicList : - public cppu::WeakImplHelper3 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XSearchableDictionaryList, ::com::sun::star::lang::XComponent, diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index b15acb1e6474..365bf04b5473 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -48,7 +48,6 @@ #include <sal/config.h> #include <osl/conditn.hxx> #include <osl/thread.hxx> -#include <cppuhelper/implbase4.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/factory.hxx> diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 824b04af14d0..75d9f8313fb9 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <osl/mutex.hxx> #include <osl/conditn.hxx> @@ -73,7 +73,7 @@ struct FPEntry class GrammarCheckingIterator: - public cppu::WeakImplHelper5 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XProofreadingIterator, ::com::sun::star::linguistic2::XLinguServiceEventListener, diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 9de3b6122faa..b4ca5b943e97 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/linguistic2/XConversionDictionary.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.h> #include "linguistic/misc.hxx" diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index abb3ed7fc5c9..f887dabf9bd8 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp> #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/shared_ptr.hpp> #include <map> @@ -43,7 +43,7 @@ class LngSvcMgr; class HyphenatorDispatcher : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XHyphenator >, diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index d07b4da92964..f9951f8a8dbf 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -26,8 +26,6 @@ #include <tools/debug.hxx> #include <unotools/lingucfg.hxx> -#include <cppuhelper/implbase1.hxx> - #include <cppuhelper/factory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 47c95d249fe8..6bedca00cf4c 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX #define INCLUDED_LINGUISTIC_SOURCE_LNGOPT_HXX -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> @@ -67,7 +67,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<sal_Int32> OPropertyListenerContainerHelper; class LinguProps : - public cppu::WeakImplHelper5 + public cppu::WeakImplHelper < com::sun::star::linguistic2::XLinguProperties, com::sun::star::beans::XFastPropertySet, diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 81fc4109aa2d..f1f8121c2b54 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -33,6 +33,7 @@ #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <boost/checked_delete.hpp> #include <boost/noncopyable.hpp> @@ -173,7 +174,7 @@ bool SvcInfo::HasLanguage( sal_Int16 nLanguage ) const } class LngSvcMgrListenerHelper : - public cppu::WeakImplHelper2 + public cppu::WeakImplHelper < linguistic2::XLinguServiceEventListener, linguistic2::XDictionaryListEventListener diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index c135ad6279fd..1d43f1646996 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_SOURCE_LNGSVCMGR_HXX #define INCLUDED_LINGUISTIC_SOURCE_LNGSVCMGR_HXX -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> @@ -55,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { class LngSvcMgr : - public cppu::WeakImplHelper3 + public cppu::WeakImplHelper < com::sun::star::linguistic2::XLinguServiceManager2, com::sun::star::lang::XServiceInfo, diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 18ddf277caec..c50ec33123da 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -24,9 +24,7 @@ #include "linguistic/misc.hxx" #include "iprcache.hxx" -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceDisplayName.hpp> @@ -46,7 +44,7 @@ class LngSvcMgr; class SpellCheckerDispatcher : - public cppu::WeakImplHelper2 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XSpellChecker1, ::com::sun::star::linguistic2::XSpellChecker diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 40832d8053b4..bd1523349d0c 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -32,8 +32,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/linguistic2/XThesaurus.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <osl/mutex.hxx> @@ -46,7 +45,7 @@ class ThesaurusDispatcher : - public cppu::WeakImplHelper1 + public cppu::WeakImplHelper < ::com::sun::star::linguistic2::XThesaurus >, diff --git a/linguistic/workben/sprophelp.hxx b/linguistic/workben/sprophelp.hxx index 939ea6b0817f..d2dc229ba9e1 100644 --- a/linguistic/workben/sprophelp.hxx +++ b/linguistic/workben/sprophelp.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_WORKBEN_SPROPHELP_HXX #define INCLUDED_LINGUISTIC_WORKBEN_SPROPHELP_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> @@ -46,7 +46,7 @@ using namespace ::com::sun::star::linguistic2; // Only propertyChange needs to be implemented. class PropertyChgHelper : - public cppu::WeakImplHelper2 + public cppu::WeakImplHelper < XPropertyChangeListener, XLinguServiceEventBroadcaster diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index 58b0afe138e0..cb9232a9ad0a 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX #define INCLUDED_LINGUISTIC_WORKBEN_SSPELLIMP_HXX -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceDisplayName.hpp> @@ -43,7 +42,7 @@ using namespace ::com::sun::star::linguistic2; class SpellChecker : - public cppu::WeakImplHelper6 + public cppu::WeakImplHelper < XSpellChecker, XLinguServiceEventBroadcaster, |