summaryrefslogtreecommitdiffstats
path: root/eventattacher
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2015-08-03 17:34:19 +0900
committerNoel Grandin <noelgrandin@gmail.com>2015-08-05 07:00:14 +0000
commitaecdaa718612285306335e307b242d6b9166052e (patch)
tree941a67128da9e17435ff76186f57ef7d9bd4ed08 /eventattacher
parenttdf#76845: wizards: fix Web wizard XSLT deadlock on Windows (diff)
downloadcore-aecdaa718612285306335e307b242d6b9166052e.tar.gz
core-aecdaa718612285306335e307b242d6b9166052e.zip
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants in embedserv and eventattacher. Change-Id: I556ad208a7ffcf85c484e298cdbb1324b8a6a659 Reviewed-on: https://gerrit.libreoffice.org/17499 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'eventattacher')
-rw-r--r--eventattacher/source/eventattacher.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 6dcae48b302e..207626d0e16b 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -36,8 +36,7 @@
#include <comphelper/processfactory.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace com::sun::star::uno;
@@ -60,7 +59,7 @@ namespace comp_EventAttacher {
// class InvocationToAllListenerMapper
// helper class to map XInvocation to XAllListener
-class InvocationToAllListenerMapper : public WeakImplHelper1< XInvocation >
+class InvocationToAllListenerMapper : public WeakImplHelper< XInvocation >
{
public:
InvocationToAllListenerMapper( const Reference< XIdlClass >& ListenerType,
@@ -209,7 +208,7 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Nam
// class EventAttacherImpl
// represents an implementation of the EventAttacher service
-class EventAttacherImpl : public WeakImplHelper3 < XEventAttacher2, XInitialization, XServiceInfo >
+class EventAttacherImpl : public WeakImplHelper < XEventAttacher2, XInitialization, XServiceInfo >
{
public:
EventAttacherImpl( const Reference< XComponentContext >& );
@@ -431,7 +430,7 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
// Implementation of an EventAttacher-related AllListeners, which brings
// a few Events to a general AllListener
-class FilterAllListenerImpl : public WeakImplHelper1< XAllListener >
+class FilterAllListenerImpl : public WeakImplHelper< XAllListener >
{
public:
FilterAllListenerImpl( EventAttacherImpl * pEA_, const OUString& EventMethod_,