stoc: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: I34fe287036ca9b8e5edcb121ba70d9a93ab05276
Reviewed-on: https://gerrit.libreoffice.org/18338
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

33 files changed, 89 insertions, 96 deletions

diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 8259f7a6e62d..c4f5d36f2638 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -25,6 +25,7 @@
 #include <osl/mutex.hxx>
 #include <uno/mapping.hxx>
 #include <uno/dispatcher.h>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/component.hxx>
@@ -141,7 +142,7 @@ public:
 
 
 class IdlClassImpl
-    : public ::cppu::WeakImplHelper1< css::reflection::XIdlClass >
+    : public ::cppu::WeakImplHelper< css::reflection::XIdlClass >
 {
     IdlReflectionServiceImpl *  _pReflection;
 
@@ -324,7 +325,7 @@ public:
 
 
 class IdlMemberImpl
-    : public ::cppu::WeakImplHelper1< css::reflection::XIdlMember >
+    : public ::cppu::WeakImplHelper< css::reflection::XIdlMember >
 {
     IdlReflectionServiceImpl *  _pReflection;
     OUString                    _aName;
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 9f7acea2a5a4..8bdc3bde313f 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -21,9 +21,8 @@
 #include <osl/diagnose.h>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <registry/registry.hxx>
@@ -91,7 +90,7 @@ protected:
 
 // class NestedKeyImpl the implenetation of interface XRegistryKey
 
-class NestedKeyImpl : public WeakImplHelper1< XRegistryKey >
+class NestedKeyImpl : public WeakImplHelper< XRegistryKey >
 {
 public:
     NestedKeyImpl( NestedRegistryImpl* pDefaultRegistry,
@@ -1118,7 +1117,7 @@ NestedRegistryImpl::NestedRegistryImpl( )
 
 NestedRegistryImpl::~NestedRegistryImpl() {}
 
-class RegistryEnumueration : public WeakImplHelper1< XEnumeration >
+class RegistryEnumueration : public WeakImplHelper< XEnumeration >
 {
 public:
     RegistryEnumueration(
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 6402890fef18..761a53f37b92 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -24,7 +24,7 @@
 #include <boost/noncopyable.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -1196,7 +1196,7 @@ static void findImplementations(    const Reference < XRegistryKey > & xSource,
 
 
 class ImplementationRegistration
-    : public WeakImplHelper3< XImplementationRegistration2, XServiceInfo, XInitialization >
+    : public WeakImplHelper< XImplementationRegistration2, XServiceInfo, XInitialization >
 {
 public:
     explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr );
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 98a18c04146e..36828afb421c 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -30,7 +30,7 @@
 #include <osl/thread.h>
 #include <sal/log.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/component.hxx>
@@ -1665,7 +1665,7 @@ private:
 };
 
 typedef
-    cppu::WeakComponentImplHelper2<
+    cppu::WeakComponentImplHelper<
         css::lang::XServiceInfo, css::beans::XIntrospection>
     Implementation_Base;
 
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 751901f14104..a5cba56b77b9 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/script/FailReason.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
@@ -1086,7 +1086,7 @@ Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId(  ) throw( Ru
 
 
 class InvocationService
-    : public WeakImplHelper2< XSingleServiceFactory, XServiceInfo >
+    : public WeakImplHelper< XSingleServiceFactory, XServiceInfo >
 {
 public:
     explicit InvocationService( const Reference<XComponentContext> & xCtx );
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index ecc67cbf9afe..301f62d66c0d 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -30,7 +30,7 @@
 #include <uno/mapping.hxx>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -81,7 +81,7 @@ typedef std::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_
 
 
 class FactoryImpl
-    : public ::cppu::WeakImplHelper3< lang::XServiceInfo,
+    : public ::cppu::WeakImplHelper< lang::XServiceInfo,
                                       script::XInvocationAdapterFactory,
                                       script::XInvocationAdapterFactory2 >
 {
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index d9355d5a3c96..24c110a54ef0 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -45,7 +45,7 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/loader/XImplementationLoader.hpp>
@@ -83,7 +83,7 @@ static OUString loader_getImplementationName()
     return OUString( "com.sun.star.comp.stoc.JavaComponentLoader" );
 }
 
-class JavaComponentLoader : public WeakImplHelper2<XImplementationLoader, XServiceInfo>
+class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServiceInfo>
 {
     css::uno::Reference<XComponentContext> m_xComponentContext;
     /** Do not use m_javaLoader directly. Instead use getJavaLoader.
diff --git a/stoc/source/javavm/interact.cxx b/stoc/source/javavm/interact.cxx
index e8cf1dc74519..afbfa6a2eb2c 100644
--- a/stoc/source/javavm/interact.cxx
+++ b/stoc/source/javavm/interact.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
 #include <com/sun/star/task/XInteractionContinuation.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 using stoc_javavm::InteractionRequest;
@@ -34,7 +34,7 @@ using stoc_javavm::InteractionRequest;
 namespace {
 
 class AbortContinuation:
-    public cppu::WeakImplHelper1<css::task::XInteractionAbort>,
+    public cppu::WeakImplHelper<css::task::XInteractionAbort>,
     private boost::noncopyable
 {
 public:
@@ -49,7 +49,7 @@ private:
 }
 
 class InteractionRequest::RetryContinuation:
-    public cppu::WeakImplHelper1<css::task::XInteractionRetry>,
+    public cppu::WeakImplHelper<css::task::XInteractionRetry>,
     private boost::noncopyable
 {
 public:
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx
index bd2d3c1eac71..8339c8abb322 100644
--- a/stoc/source/javavm/interact.hxx
+++ b/stoc/source/javavm/interact.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 namespace com { namespace sun { namespace star { namespace task {
@@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace task {
 namespace stoc_javavm {
 
 class InteractionRequest:
-    public cppu::WeakImplHelper1< css::task::XInteractionRequest >
+    public cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
 public:
     explicit InteractionRequest(css::uno::Any const & rRequest);
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index e03966e9bbb2..1684d11c80be 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -52,7 +52,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <jvmaccess/classpath.hxx>
@@ -118,7 +118,7 @@ class NoJavaIniException: public css::uno::Exception
 };
 
 class SingletonFactory:
-    private cppu::WeakImplHelper1< css::lang::XEventListener >,
+    private cppu::WeakImplHelper< css::lang::XEventListener >,
     private boost::noncopyable
 {
 public:
diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx
index cf3e3581db5a..11d3dc5dc341 100644
--- a/stoc/source/javavm/javavm.hxx
+++ b/stoc/source/javavm/javavm.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
@@ -50,7 +50,7 @@ bool configureJava(const css::uno::Reference<
 // The MS compiler needs a typedef here, so the JavaVirtualMachine ctor can call
 // its base class ctor:
 typedef
-cppu::WeakComponentImplHelper5< css::lang::XInitialization,
+cppu::WeakComponentImplHelper< css::lang::XInitialization,
                                 css::lang::XServiceInfo,
                                 css::java::XJavaVM,
                                 css::java::XJavaThreadRegister_11,
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index bb99a997a187..749cb99322a9 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -31,7 +31,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/shlib.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -53,7 +53,7 @@ using namespace osl;
 namespace {
 
 class DllComponentLoader
-    : public WeakImplHelper3< XImplementationLoader,
+    : public WeakImplHelper< XImplementationLoader,
                               XInitialization,
                               XServiceInfo >
 {
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 46b073cc2f71..b39bda686b5d 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -26,7 +26,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -71,7 +71,7 @@ typedef std::unordered_map
 
 
 class NamingService_Impl
-    : public WeakImplHelper2 < XServiceInfo, XNamingService >
+    : public WeakImplHelper < XServiceInfo, XNamingService >
 {
     Mutex                               aMutex;
     HashMap_OWString_Interface          aMap;
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 0530ef5570f0..7ecb492adee7 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -30,7 +30,7 @@
 #include <uno/environment.hxx>
 #include <typelib/typedescription.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -62,7 +62,7 @@ static Sequence< OUString > proxyfac_getSupportedServiceNames()
 }
 
 
-struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo,
+struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo,
                                                      reflection::XProxyFactory >
 {
     Environment m_uno_env;
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index fd709b196896..a4224c8d393c 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -30,8 +30,8 @@
 #include <uno/current_context.h>
 #include <uno/lbnames.h>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/implbase.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -71,7 +71,7 @@ const char s_acRestriction[] = "access-control.restriction";
 /** ac context intersects permissions of two ac contexts
 */
 class acc_Intersection
-    : public WeakImplHelper1< security::XAccessControlContext >
+    : public WeakImplHelper< security::XAccessControlContext >
 {
     Reference< security::XAccessControlContext > m_x1, m_x2;
 
@@ -124,7 +124,7 @@ void acc_Intersection::checkPermission(
 /** ac context unifies permissions of two ac contexts
 */
 class acc_Union
-    : public WeakImplHelper1< security::XAccessControlContext >
+    : public WeakImplHelper< security::XAccessControlContext >
 {
     Reference< security::XAccessControlContext > m_x1, m_x2;
 
@@ -183,7 +183,7 @@ void acc_Union::checkPermission(
 /** ac context doing permission checks on static permissions
 */
 class acc_Policy
-    : public WeakImplHelper1< security::XAccessControlContext >
+    : public WeakImplHelper< security::XAccessControlContext >
 {
     PermissionCollection m_permissions;
 
@@ -214,7 +214,7 @@ void acc_Policy::checkPermission(
 /** current context overriding dynamic ac restriction
 */
 class acc_CurrentContext
-    : public WeakImplHelper1< XCurrentContext >
+    : public WeakImplHelper< XCurrentContext >
 {
     Reference< XCurrentContext > m_xDelegate;
     Any m_restriction;
@@ -300,7 +300,7 @@ struct MutexHolder
 {
     Mutex m_mutex;
 };
-typedef WeakComponentImplHelper3<
+typedef WeakComponentImplHelper<
     security::XAccessController, lang::XServiceInfo, lang::XInitialization > t_helper;
 
 
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 920e464a1e63..fde5d685706e 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -25,7 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <cppuhelper/access_control.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -52,7 +52,7 @@ struct MutexHolder
 {
     Mutex m_mutex;
 };
-typedef WeakComponentImplHelper2< security::XPolicy, lang::XServiceInfo > t_helper;
+typedef WeakComponentImplHelper< security::XPolicy, lang::XServiceInfo > t_helper;
 
 
 class FilePolicy
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index b206d228afc2..d364013cc95f 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -27,12 +27,11 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/compbase6.hxx>
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -151,7 +150,7 @@ typedef std::unordered_set
 > HashSet_Ref;
 
 
-class ServiceEnumeration_Impl : public WeakImplHelper1< XEnumeration >
+class ServiceEnumeration_Impl : public WeakImplHelper< XEnumeration >
 {
 public:
     explicit ServiceEnumeration_Impl( const Sequence< Reference<XInterface > > & rFactories )
@@ -190,7 +189,7 @@ Any ServiceEnumeration_Impl::nextElement()
 }
 
 
-class PropertySetInfo_Impl : public WeakImplHelper1< beans::XPropertySetInfo >
+class PropertySetInfo_Impl : public WeakImplHelper< beans::XPropertySetInfo >
 {
     Sequence< beans::Property > m_properties;
 
@@ -243,7 +242,7 @@ sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name )
 /*****************************************************************************
     Enumeration by implementation
 *****************************************************************************/
-class ImplementationEnumeration_Impl : public WeakImplHelper1< XEnumeration >
+class ImplementationEnumeration_Impl : public WeakImplHelper< XEnumeration >
 {
 public:
     explicit ImplementationEnumeration_Impl( const HashSet_Ref & rImplementationMap )
@@ -314,7 +313,7 @@ typedef std::unordered_map
 /*****************************************************************************
     class OServiceManager_Listener
 *****************************************************************************/
-class OServiceManager_Listener : public WeakImplHelper1< XEventListener >
+class OServiceManager_Listener : public WeakImplHelper< XEventListener >
 {
 private:
     WeakReference<XSet > xSMgr;
@@ -358,7 +357,7 @@ struct OServiceManagerMutex
     Mutex m_mutex;
 };
 
-typedef WeakComponentImplHelper7<
+typedef WeakComponentImplHelper<
     lang::XMultiServiceFactory, lang::XMultiComponentFactory, lang::XServiceInfo,
     lang::XInitialization,
     container::XSet, container::XContentEnumerationAccess,
@@ -489,7 +488,7 @@ inline void OServiceManager::check_undisposed() const
 
 
 
-typedef WeakComponentImplHelper6<
+typedef WeakComponentImplHelper<
     lang::XMultiServiceFactory, lang::XMultiComponentFactory, lang::XServiceInfo,
     container::XSet, container::XContentEnumerationAccess,
     beans::XPropertySet > t_OServiceManagerWrapper_impl;
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 3d075e7cdbdc..c01d015e4aab 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -34,8 +34,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
@@ -53,7 +52,7 @@
 namespace {
 
 class SimpleRegistry:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::registry::XSimpleRegistry, css::lang::XServiceInfo >
 {
 public:
@@ -112,7 +111,7 @@ private:
     Registry registry_;
 };
 
-class Key: public cppu::WeakImplHelper1< css::registry::XRegistryKey > {
+class Key: public cppu::WeakImplHelper< css::registry::XRegistryKey > {
 public:
     Key(
         rtl::Reference< SimpleRegistry > const & registry,
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 037dc8578fa6..1a8c924ff923 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <typelib/typedescription.hxx>
@@ -237,7 +237,7 @@ static bool getHyperValue( sal_Int64 & rnVal, const OUString & rStr )
 }
 
 
-class TypeConverter_Impl : public WeakImplHelper2< XTypeConverter, XServiceInfo >
+class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo >
 {
     // ...misc helpers...
     static sal_Int64 toHyper(
diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index c84cacb52810..d4112ca8267c 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/thread.h>
@@ -41,7 +41,7 @@
 namespace {
 
 class Translator:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 9ac0b4c3ecf9..225963e74261 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -40,8 +40,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/character.hxx>
@@ -94,7 +93,7 @@ sal_Int32 parseScheme(OUString const & uriReference) {
 }
 
 class UriReference:
-    public cppu::WeakImplHelper1<css::uri::XUriReference>,
+    public cppu::WeakImplHelper<css::uri::XUriReference>,
     private boost::noncopyable
 {
 public:
@@ -258,7 +257,7 @@ void processSegments(
 }
 
 class Factory:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 0157f78bb7f9..5ae682e198ce 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -33,8 +33,7 @@
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrlReference.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/diagnose.h>
@@ -57,7 +56,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public ::cppu::WeakImplHelper1<css::uri::XVndSunStarExpandUrlReference>,
+    public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>,
     private boost::noncopyable
 {
 public:
@@ -152,7 +151,7 @@ OUString UrlReference::expand(
 }
 
 class Parser:
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 631e6ef589e4..7eff7b344f4c 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
@@ -189,7 +188,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public cppu::WeakImplHelper1<css::uri::XVndSunStarScriptUrlReference>,
+    public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>,
     private boost::noncopyable
 {
 public:
@@ -374,7 +373,7 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
 }
 
 class Parser:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 7c37e9ce95b8..ae12f72be000 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/string.h>
@@ -44,7 +44,7 @@
 namespace {
 
 class Factory:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
     private boost::noncopyable
 {
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index 8bcc57b34d2c..39a6305c5829 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/java/MissingJavaRuntimeException.hpp>
 #include <com/sun/star/java/JavaDisabledException.hpp>
 #include <com/sun/star/java/JavaVMCreationFailureException.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <uno/current_context.hxx>
 
 using namespace std;
@@ -60,12 +60,12 @@ using namespace css::task;
 
 #define INTERACTION_HANDLER_NAME "java-vm.interaction-handler"
 
-class Context: public WeakImplHelper1<XCurrentContext>
+class Context: public WeakImplHelper<XCurrentContext>
 {
     virtual Any SAL_CALL getValueByName( const OUString& Name ) throw (RuntimeException);
 };
 
-class InteractionHandler: public WeakImplHelper1<XInteractionHandler>
+class InteractionHandler: public WeakImplHelper<XInteractionHandler>
 {
     virtual void SAL_CALL handle( const Reference< XInteractionRequest >& Request )
         throw (RuntimeException);
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index acf5a1cc584c..e62b80b9128c 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/textenc.h>
 #include <rtl/ustring.h>
@@ -57,7 +57,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
+class Service: public cppu::WeakImplHelper< css::lang::XMain > {
 public:
     virtual sal_Int32 SAL_CALL
     run(css::uno::Sequence< OUString > const & arguments)
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 1794cb0ed9d1..434d6fe52ff4 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/file.h>
 #include <osl/thread.h>
@@ -55,7 +55,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
+class Service: public cppu::WeakImplHelper< css::lang::XMain > {
 public:
     virtual sal_Int32 SAL_CALL
     run(css::uno::Sequence< OUString > const & arguments)
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 54fab3b47eb4..5fbd2cbdfd75 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -25,7 +25,7 @@
 
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <ModuleA/XInterface1.hpp>
 #include <ModuleC/XInterfaceA.hpp>
@@ -60,7 +60,7 @@ using namespace css::container;
 
 
 
-class OInterfaceA : public WeakImplHelper1< XInterfaceA >
+class OInterfaceA : public WeakImplHelper< XInterfaceA >
 {
 public:
 
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 5099f886aa75..a540a6b3dd32 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 using namespace test;
@@ -155,7 +155,7 @@ void assign( test::TestData & rData,
 }
 
 
-class Test_Impl : public WeakImplHelper1< XLanguageBindingTest >
+class Test_Impl : public WeakImplHelper< XLanguageBindingTest >
 {
     test::TestData _aData, _aStructData;
 
@@ -278,7 +278,7 @@ public:
     virtual void SAL_CALL setRuntimeException( sal_Int32 _runtimeexception ) throw(css::uno::RuntimeException);
 };
 
-class XLB_Invocation : public WeakImplHelper1< XInvocation >
+class XLB_Invocation : public WeakImplHelper< XInvocation >
 {
     Reference< XLanguageBindingTest > _xLBT;
 
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 4c2ab0934f16..1b0735968def 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -19,8 +19,7 @@
 
 
 #include <sal/main.h>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/servicefactory.hxx>
 #include <osl/diagnose.h>
 
@@ -172,7 +171,7 @@ OUString AnyToString( const Any& aValue, sal_Bool bIncludeType, const Reference<
 
 // XPropertySetInfo for test class
 
-class ImplPropertySetInfo : public WeakImplHelper1< XPropertySetInfo >
+class ImplPropertySetInfo : public WeakImplHelper< XPropertySetInfo >
 {
      friend class ImplIntroTest;
 
@@ -253,7 +252,7 @@ sal_Bool ImplPropertySetInfo::hasPropertyByName(const OUString& Name)
 }
 
 
-class ImplIntroTest : public WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess >
+class ImplIntroTest : public WeakImplHelper< XIntroTest, XPropertySet, XNameAccess, XIndexAccess >
 {
       Reference< XMultiServiceFactory > mxMgr;
 
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index 3f216df29c4f..beb77e7d96f7 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 
 #if defined ( UNX )
@@ -44,7 +44,7 @@ using namespace osl;
 using namespace cppu;
 
 
-class EmptyComponentContext : public WeakImplHelper1< XComponentContext >
+class EmptyComponentContext : public WeakImplHelper< XComponentContext >
 {
 public:
     virtual Any SAL_CALL getValueByName( const OUString& /*Name*/ )
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 9d46129bbc65..20fb2597e7b2 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -24,8 +24,7 @@
 #include <uno/environment.hxx>
 #include <uno/lbnames.h>
 #include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/XCurrentContext.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -44,7 +43,7 @@ using namespace ::com::sun::star;
 using namespace css::uno;
 
 
-typedef WeakImplHelper3< lang::XServiceInfo,
+typedef WeakImplHelper< lang::XServiceInfo,
                          XCurrentContext,
                          reflection::XProxyFactory > t_impl;
 
@@ -99,7 +98,7 @@ int TargetObject::s_obj = 0;
 
 
 
-class TestMaster : public WeakImplHelper1< lang::XServiceInfo >
+class TestMaster : public WeakImplHelper< lang::XServiceInfo >
 {
     Reference< XAggregation > m_xProxyTarget;
     Reference<lang::XServiceInfo> m_xOtherProxyTargetBeforeSetDelegator;
@@ -122,7 +121,7 @@ public:
         throw (RuntimeException)
     {
         Any aRet(
-            WeakImplHelper1< lang::XServiceInfo >::queryInterface( rType ) );
+            WeakImplHelper< lang::XServiceInfo >::queryInterface( rType ) );
         if (aRet.hasValue())
             return aRet;
         return m_xProxyTarget->queryAggregation( rType );
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 807016dcc04a..9fb7a64d813e 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -29,7 +29,7 @@
 
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <registry/registry.hxx>
 
 #include <com/sun/star/registry/XSimpleRegistry.hpp>
@@ -86,7 +86,7 @@ Reference< XMultiServiceFactory > createRegistryServiceManager( const OUString&
 *
 *************************************/
 static sal_uInt32 nInstanceCount = 0;
-class Test_Manager_Impl : public WeakImplHelper1< XServiceInfo >
+class Test_Manager_Impl : public WeakImplHelper< XServiceInfo >
 {
 public:
     Test_Manager_Impl(){ nInstanceCount++;}