4 files changed, 11 insertions, 14 deletions
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 559f3e2a3c4a..a06b4d565ff8 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -32,8 +32,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -61,7 +60,7 @@ using namespace ::com::sun::star::beans;
  */
 
 class ODataStreamTest :
-        public WeakImplHelper1< XSimpleTest >
+        public WeakImplHelper< XSimpleTest >
 {
 public:
     ODataStreamTest( const Reference < XMultiServiceFactory > & rFactory ) :
@@ -367,7 +366,7 @@ OUString    ODataStreamTest_getImplementationName( int i) throw ()
     }
 }
 
-class MyPersistObject : public WeakImplHelper2< XPersistObject , XPropertySet >
+class MyPersistObject : public WeakImplHelper< XPersistObject , XPropertySet >
 {
 public:
     MyPersistObject( ) : m_sServiceName( OMyPersistObject_getServiceName() ) ,
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index d743e32bf3a4..f481c31bc860 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -26,9 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <cppuhelper/factory.hxx>
-
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -44,7 +42,7 @@ using namespace ::com::sun::star::test;
 #include "testfactreg.hxx"
 
 
-class OMarkableOutputStreamTest : public WeakImplHelper1< XSimpleTest >
+class OMarkableOutputStreamTest : public WeakImplHelper< XSimpleTest >
 {
 public:
     OMarkableOutputStreamTest( const Reference< XMultiServiceFactory > & rFactory );
@@ -403,7 +401,7 @@ OUString    OMarkableOutputStreamTest_getImplementationName() throw ()
 // Input stream
 
 
-class OMarkableInputStreamTest : public WeakImplHelper1< XSimpleTest >
+class OMarkableInputStreamTest : public WeakImplHelper< XSimpleTest >
 {
 public:
     OMarkableInputStreamTest( const Reference< XMultiServiceFactory > & rFactory );
diff --git a/io/test/stm/pipetest.cxx b/io/test/stm/pipetest.cxx
index f2ad64308ae5..2d9ee9f5091f 100644
--- a/io/test/stm/pipetest.cxx
+++ b/io/test/stm/pipetest.cxx
@@ -28,7 +28,7 @@
 
 #include <cppuhelper/factory.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
@@ -91,7 +91,7 @@ private:
 
 
 
-class OPipeTest : public WeakImplHelper1 < XSimpleTest >
+class OPipeTest : public WeakImplHelper < XSimpleTest >
 {
 public:
     OPipeTest( const Reference< XMultiServiceFactory >  & rFactory );
diff --git a/io/test/stm/pumptest.cxx b/io/test/stm/pumptest.cxx
index 34a9a783ef8b..74d74dfaa272 100644
--- a/io/test/stm/pumptest.cxx
+++ b/io/test/stm/pumptest.cxx
@@ -34,7 +34,7 @@
 
 #include <uno/dispatcher.h>
 #include <uno/mapping.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
@@ -60,7 +60,7 @@ static void mywait()
     osl_yieldThread();
 }
 
-class OPumpTest : public WeakImplHelper1 < XSimpleTest >
+class OPumpTest : public WeakImplHelper < XSimpleTest >
 {
 public:
     OPumpTest( const Reference< XMultiServiceFactory >  & rFactory );
@@ -226,7 +226,7 @@ void OPumpTest::testSimple( const Reference < XInterface > &r )
 
 }
 
-class TestListener: public WeakImplHelper1< XStreamListener >
+class TestListener: public WeakImplHelper< XStreamListener >
 {
 public:
     sal_Bool m_bStarted;