From a5aad2ac58f01702b91db051e66e2e855de00b10 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 4 Mar 2014 15:41:50 -0600
Subject: kill XINTERFACE_IMPL_9

Change-Id: I651599cf3ec82a31f3260985907b5b2d56665da3
---
 ucbhelper/source/provider/resultset.cxx | 38 ++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 9e98e3681869..8c3d79112e19 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -248,20 +248,34 @@ ResultSet::~ResultSet()
 
 // XInterface methods.
 
+void SAL_CALL ResultSet::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ResultSet::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-XINTERFACE_IMPL_9( ResultSet,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   lang::XComponent,
-                   com::sun::star::ucb::XContentAccess,
-                   sdbc::XResultSet,
-                   sdbc::XResultSetMetaDataSupplier,
-                   sdbc::XRow,
-                   sdbc::XCloseable,
-                   beans::XPropertySet );
-
-
+css::uno::Any SAL_CALL ResultSet::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< lang::XServiceInfo* >(this)),
+                                               (static_cast< lang::XComponent* >(this)),
+                                               (static_cast< css::ucb::XContentAccess* >(this)),
+                                               (static_cast< sdbc::XResultSet* >(this)),
+                                               (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)),
+                                               (static_cast< sdbc::XRow* >(this)),
+                                               (static_cast< sdbc::XCloseable* >(this)),
+                                               (static_cast< beans::XPropertySet* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
-- 
cgit