kill XINTERFACE_IMPL_2

Change-Id: Ic735b7d6ddfaacab9af7405e4dacc62f818bed8c

7 files changed, 155 insertions, 46 deletions

diff --git a/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index aed7305e5efe..d83643f63f5b 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -42,13 +42,27 @@ namespace ucbhelper
 
 // XInterface methods
 
+void SAL_CALL ActiveDataSink::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ActiveDataSink::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( ActiveDataSink,
-                   lang::XTypeProvider,
-                   io::XActiveDataSink );
-
-
+css::uno::Any SAL_CALL ActiveDataSink::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< io::XActiveDataSink* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods
 
diff --git a/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 27ab53a9b4c0..15baa8e65ebf 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -42,13 +42,27 @@ namespace ucbhelper
 
 // XInterface methods
 
+void SAL_CALL ActiveDataStreamer::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ActiveDataStreamer::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( ActiveDataStreamer,
-                   lang::XTypeProvider,
-                   io::XActiveDataStreamer );
-
-
+css::uno::Any SAL_CALL ActiveDataStreamer::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< io::XActiveDataStreamer* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods
 
diff --git a/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index a8e938cd21c0..80b0004b6035 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.cxx
@@ -85,13 +85,27 @@ CommandEnvironment::~CommandEnvironment()
 
 // XInterface methods
 
+void SAL_CALL CommandEnvironment::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL CommandEnvironment::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( CommandEnvironment,
-                   XTypeProvider,
-                   XCommandEnvironment );
-
-
+css::uno::Any SAL_CALL CommandEnvironment::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< XCommandEnvironment* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods
 
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index 2cffd349e300..f4b9beba6891 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1321,13 +1321,27 @@ void Content_Impl::inserted()
 
 // XInterface methods.
 
+void SAL_CALL ContentEventListener_Impl::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ContentEventListener_Impl::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( ContentEventListener_Impl,
-                   XContentEventListener,
-                   XEventListener ); /* base of XContentEventListener */
-
-
+css::uno::Any SAL_CALL ContentEventListener_Impl::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< XContentEventListener* >(this)),
+                                               (static_cast< XEventListener* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XContentEventListener methods.
 
diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index b3a20b8e0940..b3f0ca9d95a2 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.cxx
@@ -62,22 +62,32 @@ PropertySetInfo::~PropertySetInfo()
 
 // XInterface methods.
 
+void SAL_CALL PropertySetInfo::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL PropertySetInfo::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( PropertySetInfo,
-                   lang::XTypeProvider,
-                   beans::XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< beans::XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
-
-
-
 XTYPEPROVIDER_IMPL_2( PropertySetInfo,
-                          lang::XTypeProvider,
-                          beans::XPropertySetInfo );
-
+                      lang::XTypeProvider,
+                      beans::XPropertySetInfo );
 
 
 // XPropertySetInfo methods.
@@ -236,12 +246,27 @@ CommandProcessorInfo::~CommandProcessorInfo()
 // XInterface methods.
 
 
+void SAL_CALL CommandProcessorInfo::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_IMPL_2( CommandProcessorInfo,
-                   lang::XTypeProvider,
-                   com::sun::star::ucb::XCommandInfo );
-
+void SAL_CALL CommandProcessorInfo::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
+css::uno::Any SAL_CALL CommandProcessorInfo::queryInterface( const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< css::ucb::XCommandInfo* >(this))
+                    );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 6202e4c40c06..9e98e3681869 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -1594,14 +1594,28 @@ PropertySetInfo::~PropertySetInfo()
 
 
 // XInterface methods.
+void SAL_CALL PropertySetInfo::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL PropertySetInfo::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_2( PropertySetInfo,
-                   lang::XTypeProvider,
-                   beans::XPropertySetInfo );
-
-
+css::uno::Any SAL_CALL PropertySetInfo::queryInterface(
+                                const css::uno::Type & rType )
+    throw( css::uno::RuntimeException, std::exception )
+{
+    css::uno::Any aRet = cppu::queryInterface( rType,
+                                               (static_cast< lang::XTypeProvider* >(this)),
+                                               (static_cast< beans::XPropertySetInfo* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 1bea9ae8a34e..25b6e8483502 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -118,13 +118,27 @@ ResultSetMetaData::~ResultSetMetaData()
 
 // XInterface methods.
 
+void SAL_CALL ResultSetMetaData::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ResultSetMetaData::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_2( ResultSetMetaData,
-                   XTypeProvider,
-                   XResultSetMetaData );
-
-
+css::uno::Any SAL_CALL ResultSetMetaData::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< XResultSetMetaData* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.