[Libreoffice-commits] core.git: 2 commits - ucb/source

[Norbert Thiebaud]

 ucb/source/core/provprox.cxx |   37 -------------------------------------
 ucb/source/core/provprox.hxx |   20 ++++----------------
 ucb/source/core/ucbprops.cxx |   35 -----------------------------------
 ucb/source/core/ucbprops.hxx |   25 ++++++-------------------
 4 files changed, 10 insertions(+), 107 deletions(-)

New commits:
commit 1b2b8f8d5aa1e402c31ee9853dd0ec229d3a32b7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Mar 6 15:31:10 2014 -0600

    use WeakImplHelper2 for UcbPropertiesManager
    
    Change-Id: I9b3c9afcf6d63f1a1e9c973c7498dcdc938f589d

diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 3a20cc0..6bb31ff 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 2723d9e..1201d29 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()
 
commit dba5cd13f7339426d1c8b6eab7a8621def80fea5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Mar 6 15:30:48 2014 -0600

    use WeakImplHelper2 for UcbContentProviderProxyFactory
    
    Change-Id: I211eb7f14914df88b488d48d2d6a8c204595c7e4

diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index a28ae6c..746b52f 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 dd9faba..8cc8835 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()