8 files changed, 14 insertions, 15 deletions
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index 232b02b53bed..1fe1bd6b5e3c 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -31,7 +31,7 @@
 #include "com/sun/star/lang/XComponent.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
-#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase.hxx"
 #include "osl/conditn.hxx"
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
@@ -67,7 +67,7 @@ namespace rtl { class ByteSequence; }
 namespace binaryurp {
 
 class Bridge:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         com::sun::star::bridge::XBridge, com::sun::star::lang::XComponent >
 {
 public:
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 27ec27429d07..ac13ace16574 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -32,7 +32,7 @@
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "cppuhelper/basemutex.hxx"
-#include "cppuhelper/compbase2.hxx"
+#include "cppuhelper/compbase.hxx"
 #include "sal/types.h"
 
 namespace com { namespace sun { namespace star {
@@ -49,7 +49,7 @@ namespace binaryurp {
 // the implementation does not care about a disposed state:
 
 typedef
-    cppu::WeakComponentImplHelper2<
+    cppu::WeakComponentImplHelper<
         com::sun::star::lang::XServiceInfo,
         com::sun::star::bridge::XBridgeFactory2 >
     BridgeFactoryBase;
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index 99d0a985802e..942572b36f5b 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -34,7 +34,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/implbase.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/weak.hxx"
 #include "osl/conditn.hxx"
@@ -176,7 +176,7 @@ css::uno::Any Derived::queryInterface(css::uno::Type const & type)
 
 namespace {
 
-class Service: public cppu::WeakImplHelper3<
+class Service: public cppu::WeakImplHelper<
     css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest >
 {
 public:
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index 380abf4f5ecd..e8015c70e6f7 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -25,7 +25,7 @@
 #include "uno/environment.hxx"
 #include "jvmaccess/virtualmachine.hxx"
 #include "jvmaccess/unovirtualmachine.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/implbase.hxx"
 
 #include "test/java_uno/anytest/XTransport.hpp"
 #include "test/java_uno/anytest/DerivedInterface.hpp"
@@ -37,7 +37,7 @@ using ::test::java_uno::anytest::XTransport;
 namespace
 {
 
-class Transport : public ::cppu::WeakImplHelper1< XTransport >
+class Transport : public ::cppu::WeakImplHelper< XTransport >
 {
 public:
     virtual Any SAL_CALL mapAny( Any const & any )
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 34ca8c0d9d82..3cfd75f0c6b2 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -35,7 +35,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase.hxx"
 #include <cppuhelper/supportsservice.hxx>
 #include "cppuhelper/weak.hxx"
 #include "rtl/string.h"
@@ -48,7 +48,7 @@
 
 namespace {
 
-class Service: public cppu::WeakImplHelper2<
+class Service: public cppu::WeakImplHelper<
     css::lang::XServiceInfo, test::java_uno::equals::XTestInterface >
 {
 public:
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 4a20eee6477e..f36c35ea480c 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -36,7 +36,7 @@
 #include "com/sun/star/uno/XComponentContext.hpp"
 #include "com/sun/star/uno/XInterface.hpp"
 #include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/implbase.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "osl/thread.hxx"
@@ -47,7 +47,7 @@
 
 namespace {
 
-class Client: public cppu::WeakImplHelper2<
+class Client: public cppu::WeakImplHelper<
     css::lang::XMain, test::javauno::nativethreadpool::XSource >
 {
 public:
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index e119cd2b7366..81a3d9b8d1f4 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -34,7 +34,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/implementationentry.hxx"
 #include "cppuhelper/weak.hxx"
 #include "rtl/ustring.hxx"
@@ -43,7 +43,7 @@
 namespace {
 
 class Server:
-    public cppu::WeakImplHelper1< test::javauno::nativethreadpool::XSource >
+    public cppu::WeakImplHelper< test::javauno::nativethreadpool::XSource >
 {
 public:
     explicit Server(
diff --git a/bridges/test/testserver.cxx b/bridges/test/testserver.cxx
index 68cc3b69b40d..df2c22d9ef43 100644
--- a/bridges/test/testserver.cxx
+++ b/bridges/test/testserver.cxx
@@ -26,7 +26,6 @@
 #include <osl/thread.hxx>
 
 #include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/connection/XAcceptor.hpp>
 #include <com/sun/star/connection/XConnection.hpp>