kill XINTERFACE_IMPL_2

Change-Id: Ic735b7d6ddfaacab9af7405e4dacc62f818bed8c

1 files changed, 19 insertions, 5 deletions

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.