From 8b40ddd9f092ea97707fbde8c4d7dd58ac867af2 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 4 Mar 2014 16:08:15 -0600
Subject: kill XINTERFACE_IMPL_4

Change-Id: I88e2e62b82f40cfa3e892023d381f7611e093fd6
---
 ucbhelper/source/provider/resultsethelper.cxx | 29 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 4fcd0e10e622..359cca501d7f 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.cxx
@@ -70,16 +70,29 @@ ResultSetImplHelper::~ResultSetImplHelper()
 
 
 // XInterface methods.
+void SAL_CALL ResultSetImplHelper::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
+void SAL_CALL ResultSetImplHelper::release()
+    throw()
+{
+    OWeakObject::release();
+}
 
-
-XINTERFACE_IMPL_4( ResultSetImplHelper,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   lang::XComponent, /* base of XDynamicResultSet */
-                   com::sun::star::ucb::XDynamicResultSet );
-
-
+css::uno::Any SAL_CALL ResultSetImplHelper::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::XDynamicResultSet* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
-- 
cgit