9 files changed, 23 insertions, 25 deletions
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++;}