kill XINTERFACE_IMPL_2

Change-Id: Ic735b7d6ddfaacab9af7405e4dacc62f818bed8c

6 files changed, 117 insertions, 26 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index e6929265598f..15912091e074 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -521,12 +521,27 @@ CCRS_PropertySetInfo::~CCRS_PropertySetInfo()
 
 // XInterface methods.
 
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( CCRS_PropertySetInfo
-                  , XTypeProvider
-                  , XPropertySetInfo
-                  );
+void SAL_CALL CCRS_PropertySetInfo::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL CCRS_PropertySetInfo::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
+css::uno::Any SAL_CALL CCRS_PropertySetInfo::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< XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index caf63780aed7..b0c510b11920 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -470,12 +470,27 @@ DynamicResultSetWrapperListener::~DynamicResultSetWrapperListener()
 
 // XInterface methods.
 
-//list all interfaces inclusive baseclasses of interfaces
-XINTERFACE_IMPL_2( DynamicResultSetWrapperListener
-                   , XDynamicResultSetListener
-                   , XEventListener //base of XDynamicResultSetListener
-                   );
+void SAL_CALL DynamicResultSetWrapperListener::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
+
+void SAL_CALL DynamicResultSetWrapperListener::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
+css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XDynamicResultSetListener* >(this)),
+                                               (static_cast< XEventListener* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XDynamicResultSetListener methods:
 
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index e20ef5af6d95..7da0d476f89b 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -53,13 +53,28 @@ ContentIdentifier::~ContentIdentifier()
 
 // XInterface methods.
 
+void SAL_CALL ContentIdentifier::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentIdentifier::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( ContentIdentifier,
-                   XTypeProvider,
-                   XContentIdentifier );
-
-
+css::uno::Any SAL_CALL ContentIdentifier::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< XContentIdentifier* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 3bbd9245a1d7..131aa365610c 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -2365,13 +2365,27 @@ PropertySetInfo_Impl::~PropertySetInfo_Impl()
 
 // XInterface methods.
 
+void SAL_CALL PropertySetInfo_Impl::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL PropertySetInfo_Impl::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( PropertySetInfo_Impl,
-                   XTypeProvider,
-                   XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo_Impl::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< XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 618f45a78fbd..28bc8f5a61d6 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -570,11 +570,27 @@ SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
 
 // XInterface methods.
 
+void SAL_CALL SortedDynamicResultSetListener::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_IMPL_2( SortedDynamicResultSetListener,
-                   XEventListener,  /* base class of XDynamicResultSetListener */
-                   XDynamicResultSetListener );
+void SAL_CALL SortedDynamicResultSetListener::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
+css::uno::Any SAL_CALL SortedDynamicResultSetListener::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XEventListener* >(this)),
+                                               (static_cast< XDynamicResultSetListener* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XEventListener ( base of XDynamicResultSetListener )
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index bbeec37c593a..29ae56c82c68 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -2021,11 +2021,27 @@ SRSPropertySetInfo::~SRSPropertySetInfo()
 
 // XInterface methods.
 
+void SAL_CALL SRSPropertySetInfo::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_IMPL_2( SRSPropertySetInfo,
-                   XTypeProvider,
-                   XPropertySetInfo );
+void SAL_CALL SRSPropertySetInfo::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
+css::uno::Any SAL_CALL SRSPropertySetInfo::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< XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.