summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-07-30 16:41:22 +0900
committerNoel Grandin <noelgrandin@gmail.com>2015-07-30 13:15:51 +0000
commite646e614e26d647c6b7ce6918b8dddad71568f96 (patch)
tree5451c01d4a6210bb8c4696acb07526a6465f391e /editeng
parent517e5d1e3339133c3a91d801fdb85f1d70057883 (diff)
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants for editeng. Change-Id: I28373dd31b8b922f59b99bf1c12faa31c72b9906 Reviewed-on: https://gerrit.libreoffice.org/17416 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/accessibility/AccessibleContextBase.cxx4
-rw-r--r--editeng/source/accessibility/AccessibleHyperlink.hxx4
-rw-r--r--editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx4
-rw-r--r--editeng/source/misc/unolingu.cxx10
4 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index 3217f0d8e307..24d669872ee7 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -45,7 +45,7 @@ namespace accessibility {
AccessibleContextBase::AccessibleContextBase (
const uno::Reference<XAccessible>& rxParent,
const sal_Int16 aRole)
- : WeakComponentImplHelper4 (MutexOwner::maMutex),
+ : WeakComponentImplHelper(MutexOwner::maMutex),
mxStateSet (NULL),
mxRelationSet (NULL),
mxParent(rxParent),
@@ -488,7 +488,7 @@ uno::Sequence< ::com::sun::star::uno::Type>
// This class supports no interfaces on its own. Just return those
// supported by the base class.
- return WeakComponentImplHelper4::getTypes();
+ return WeakComponentImplHelper::getTypes();
}
uno::Sequence<sal_Int8> SAL_CALL
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index fe0ef70e91e4..507f53210a45 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_EDITENG_SOURCE_ACCESSIBILITY_ACCESSIBLEHYPERLINK_HXX
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/interfacecontainer.hxx>
@@ -35,7 +35,7 @@ class SvxAccessibleTextAdapter;
namespace accessibility
{
- class AccessibleHyperlink : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleHyperlink >
+ class AccessibleHyperlink : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleHyperlink >
{
private:
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
index eaf15d64339d..95c626d5ef3f 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx
@@ -13,7 +13,7 @@
#include <sal/types.h>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <sax/fastattribs.hxx>
@@ -31,7 +31,7 @@ enum SvXMLAutoCorrectToken : sal_Int32
};
class SvXMLAutoCorrectTokenHandler : public
- cppu::WeakImplHelper1< css::xml::sax::XFastTokenHandler >,
+ cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{
public:
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index c85eda2586df..a90090fee639 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -37,7 +37,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/ucbhelper.hxx>
@@ -72,7 +72,7 @@ static uno::Reference< XLinguServiceManager2 > GetLngSvcMgr_Impl()
//! The dummy accesses the real implementation (and thus loading the DLL)
//! when "real" work needs to be done only.
class ThesDummy_Impl :
- public cppu::WeakImplHelper1< XThesaurus >
+ public cppu::WeakImplHelper< XThesaurus >
{
uno::Reference< XThesaurus > xThes; // the real one...
Sequence< lang::Locale > *pLocaleSeq;
@@ -204,7 +204,7 @@ uno::Sequence< uno::Reference< linguistic2::XMeaning > > SAL_CALL
//! The dummy accesses the real implementation (and thus loading the DLL)
//! when it needs to be done only.
class SpellDummy_Impl :
- public cppu::WeakImplHelper1< XSpellChecker1 >
+ public cppu::WeakImplHelper< XSpellChecker1 >
{
uno::Reference< XSpellChecker1 > xSpell; // the real one...
@@ -301,7 +301,7 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL
//! The dummy accesses the real implementation (and thus loading the DLL)
//! when it needs to be done only.
class HyphDummy_Impl :
- public cppu::WeakImplHelper1< XHyphenator >
+ public cppu::WeakImplHelper< XHyphenator >
{
uno::Reference< XHyphenator > xHyph; // the real one...
@@ -429,7 +429,7 @@ uno::Reference< linguistic2::XPossibleHyphens > SAL_CALL
return xRes;
}
-class LinguMgrExitLstnr : public cppu::WeakImplHelper1<XEventListener>
+class LinguMgrExitLstnr : public cppu::WeakImplHelper<XEventListener>
{
uno::Reference< XDesktop2 > xDesktop;