lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 5 ++---
lingucomponent/source/languageguessing/guesslang.cxx | 4 ++--
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx | 5 ++---
lingucomponent/source/spellcheck/spell/sspellimp.hxx | 5 ++---
lingucomponent/source/thesaurus/libnth/nthesdta.hxx | 4 ++--
lingucomponent/source/thesaurus/libnth/nthesimp.hxx | 5 ++---
6 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit e87c08babed9e3ac34908771fc95cab5386f01a2
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Wed Aug 19 10:23:16 2015 +0900
lingucomponent: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Ibe00b26512a4895a603a084f4e816c74b99894df
Reviewed-on: https://gerrit.libreoffice.org/17850
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index ad5db82..d7bb068 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_HYPHENATOR_HYPHEN_HYPHENIMP_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>
@@ -56,7 +55,7 @@ struct HDInfo {
};
class Hyphenator :
- public cppu::WeakImplHelper6
+ public cppu::WeakImplHelper
<
XHyphenator,
XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index 9c848cd..2b2da0e 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -25,7 +25,7 @@
#include <sal/config.h>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <simpleguesser.hxx>
@@ -74,7 +74,7 @@ static osl::Mutex & GetLangGuessMutex()
}
class LangGuess_Impl :
- public ::cppu::WeakImplHelper2<
+ public ::cppu::WeakImplHelper<
XLanguageGuessing,
XServiceInfo >,
private boost::noncopyable
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index df566a8..5a53fd3 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_MACOSXSPELL_MACSPELLIMP_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#ifdef MACOSX
#include <premac.h>
@@ -50,7 +49,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
class MacSpellChecker :
- public cppu::WeakImplHelper6
+ public cppu::WeakImplHelper
<
XSpellChecker,
XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 097471b..ffbff58 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_SSPELLIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_SPELLCHECK_SPELL_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>
@@ -45,7 +44,7 @@ using namespace ::com::sun::star::linguistic2;
class Hunspell;
class SpellChecker :
- public cppu::WeakImplHelper6
+ public cppu::WeakImplHelper
<
XSpellChecker,
XLinguServiceEventBroadcaster,
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
index 9e676e2..28e2f2f 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.hxx
@@ -21,13 +21,13 @@
#define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESDTA_HXX
#include <com/sun/star/linguistic2/XMeaning.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
namespace linguistic
{
class Meaning :
- public cppu::WeakImplHelper1
+ public cppu::WeakImplHelper
<
::com::sun::star::linguistic2::XMeaning
>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
index 87ab6dd..f88dc28 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
#define INCLUDED_LINGUCOMPONENT_SOURCE_THESAURUS_LIBNTH_NTHESIMP_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/lang/XComponent.hpp>
@@ -56,7 +55,7 @@ namespace com { namespace sun { namespace star { namespace
beans {
}}}}
class Thesaurus :
- public cppu::WeakImplHelper5
+ public cppu::WeakImplHelper
<
XThesaurus,
XInitialization,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
