2 files changed, 4 insertions, 53 deletions
diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index a28ae6cd77be..746b52f874e6 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -48,43 +48,6 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
 {
 }
 
-
-
-// XInterface methods.
-void SAL_CALL UcbContentProviderProxyFactory::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL UcbContentProviderProxyFactory::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UcbContentProviderProxyFactory::queryInterface( const css::uno::Type & rType )
-    throw( css::uno::RuntimeException, std::exception )
-{
-    css::uno::Any aRet = cppu::queryInterface( rType,
-                                               (static_cast< XTypeProvider* >(this)),
-                                               (static_cast< XServiceInfo* >(this)),
-                                               (static_cast< XContentProviderFactory* >(this))
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_3( UcbContentProviderProxyFactory,
-                          XTypeProvider,
-                      XServiceInfo,
-                          XContentProviderFactory );
-
-
-
 // XServiceInfo methods.
 
 
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index dd9faba94198..8cc8835d84a8 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/ucb/XContentProviderSupplier.hpp>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 
 
@@ -44,11 +45,9 @@
 
 
 
-class UcbContentProviderProxyFactory :
-                public cppu::OWeakObject,
-                public com::sun::star::lang::XTypeProvider,
-                public com::sun::star::lang::XServiceInfo,
-                public com::sun::star::ucb::XContentProviderFactory
+class UcbContentProviderProxyFactory : public cppu::WeakImplHelper2 <
+    css::lang::XServiceInfo,
+    css::ucb::XContentProviderFactory >
 {
     com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >
                                 m_xSMgr;
@@ -59,17 +58,6 @@ public:
                 com::sun::star::lang::XMultiServiceFactory >& rxSMgr );
     virtual ~UcbContentProviderProxyFactory();
 
-    // XInterface
-    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
-        throw( css::uno::RuntimeException, std::exception );
-    virtual void SAL_CALL acquire()
-        throw();
-    virtual void SAL_CALL release()
-        throw();
-
-    // XTypeProvider
-    XTYPEPROVIDER_DECL()
-
     // XServiceInfo
     XSERVICEINFO_DECL()