use WeakImplHelper2 for UcbPropertiesManager

Change-Id: I9b3c9afcf6d63f1a1e9c973c7498dcdc938f589d

2 files changed, 6 insertions, 54 deletions

diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 3a20cc0ada74..6bb31ff41223 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -308,41 +308,6 @@ UcbPropertiesManager::~UcbPropertiesManager()
 
 
 
-// XInterface methods.
-void SAL_CALL UcbPropertiesManager::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-void SAL_CALL UcbPropertiesManager::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL UcbPropertiesManager::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< XPropertySetInfo* >(this))
-                                               );
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-
-
-XTYPEPROVIDER_IMPL_3( UcbPropertiesManager,
-                          XTypeProvider,
-                      XServiceInfo,
-                          XPropertySetInfo );
-
-
-
 // XServiceInfo methods.
 
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 2723d9e7f778..1201d2909ce5 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -27,6 +27,7 @@
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
 #include <ucbhelper/macros.hxx>
+#include <cppuhelper/implbase2.hxx>
 
 
 
@@ -38,15 +39,12 @@
 
 
 
-class UcbPropertiesManager :
-                public cppu::OWeakObject,
-                public com::sun::star::lang::XTypeProvider,
-                public com::sun::star::lang::XServiceInfo,
-                public com::sun::star::beans::XPropertySetInfo
+class UcbPropertiesManager : public cppu::WeakImplHelper2 <
+    css::lang::XServiceInfo,
+    css::beans::XPropertySetInfo >
 {
-    com::sun::star::uno::Sequence< com::sun::star::beans::Property >*
-                                m_pProps;
-    osl::Mutex                  m_aMutex;
+    css::uno::Sequence< css::beans::Property >* m_pProps;
+    osl::Mutex m_aMutex;
 
 private:
     sal_Bool queryProperty( const OUString& rName,
@@ -58,17 +56,6 @@ public:
                                 rxSMgr );
     virtual ~UcbPropertiesManager();
 
-    // 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()