Kaydet (Commit) e87c08ba authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

lingucomponent: tdf#88206 replace cppu::WeakImplHelper*

with the variadic variants.

Change-Id: Ibe00b26512a4895a603a084f4e816c74b99894df
Reviewed-on: https://gerrit.libreoffice.org/17850Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst e00d41f7
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX #define INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceDisplayName.hpp> #include <com/sun/star/lang/XServiceDisplayName.hpp>
...@@ -56,7 +55,7 @@ struct HDInfo { ...@@ -56,7 +55,7 @@ struct HDInfo {
}; };
class Hyphenator : class Hyphenator :
public cppu::WeakImplHelper6 public cppu::WeakImplHelper
< <
XHyphenator, XHyphenator,
XLinguServiceEventBroadcaster, XLinguServiceEventBroadcaster,
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <sal/config.h> #include <sal/config.h>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <simpleguesser.hxx> #include <simpleguesser.hxx>
...@@ -74,7 +74,7 @@ static osl::Mutex & GetLangGuessMutex() ...@@ -74,7 +74,7 @@ static osl::Mutex & GetLangGuessMutex()
} }
class LangGuess_Impl : class LangGuess_Impl :
public ::cppu::WeakImplHelper2< public ::cppu::WeakImplHelper<
XLanguageGuessing, XLanguageGuessing,
XServiceInfo >, XServiceInfo >,
private boost::noncopyable private boost::noncopyable
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX #define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase6.hxx>
#ifdef MACOSX #ifdef MACOSX
#include <premac.h> #include <premac.h>
...@@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang; ...@@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2; using namespace ::com::sun::star::linguistic2;
class MacSpellChecker : class MacSpellChecker :
public cppu::WeakImplHelper6 public cppu::WeakImplHelper
< <
XSpellChecker, XSpellChecker,
XLinguServiceEventBroadcaster, XLinguServiceEventBroadcaster,
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX #define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceDisplayName.hpp> #include <com/sun/star/lang/XServiceDisplayName.hpp>
...@@ -45,7 +44,7 @@ using namespace ::com::sun::star::linguistic2; ...@@ -45,7 +44,7 @@ using namespace ::com::sun::star::linguistic2;
class Hunspell; class Hunspell;
class SpellChecker : class SpellChecker :
public cppu::WeakImplHelper6 public cppu::WeakImplHelper
< <
XSpellChecker, XSpellChecker,
XLinguServiceEventBroadcaster, XLinguServiceEventBroadcaster,
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
#define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESDTA_HXX #define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESDTA_HXX
#include <com/sun/star/linguistic2/XMeaning.hpp> #include <com/sun/star/linguistic2/XMeaning.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
namespace linguistic namespace linguistic
{ {
class Meaning : class Meaning :
public cppu::WeakImplHelper1 public cppu::WeakImplHelper
< <
::com::sun::star::linguistic2::XMeaning ::com::sun::star::linguistic2::XMeaning
> >
......
...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX #ifndef INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX #define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase5.hxx>
#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
...@@ -56,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace beans { ...@@ -56,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace beans {
}}}} }}}}
class Thesaurus : class Thesaurus :
public cppu::WeakImplHelper5 public cppu::WeakImplHelper
< <
XThesaurus, XThesaurus,
XInitialization, XInitialization,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment