From 2ef98b947e8babddeaf5b67e580ba2f184c0e157 Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Tue, 4 Mar 2014 15:22:44 -0600
Subject: kill XINTERFACE_IMPL_6

Change-Id: I1445524d3c15a3dec881c1499910779b9d61b840
---
 xmlhelp/source/cxxhelp/provider/provider.cxx | 31 +++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'xmlhelp/source/cxxhelp/provider/provider.cxx')

diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 3bc85c880702..40142c494955 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -62,14 +62,31 @@ ContentProvider::~ContentProvider()
 }
 
 // XInterface methods.
+void SAL_CALL ContentProvider::acquire()
+    throw()
+{
+    OWeakObject::acquire();
+}
 
-XINTERFACE_IMPL_6( ContentProvider,
-                   lang::XTypeProvider,
-                   lang::XServiceInfo,
-                   ucb::XContentProvider,
-                   lang::XComponent,
-                   lang::XEventListener, /* base of XContainerListener */
-                   container::XContainerListener);
+void SAL_CALL ContentProvider::release()
+    throw()
+{
+    OWeakObject::release();
+}
+
+css::uno::Any SAL_CALL ContentProvider::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< ucb::XContentProvider* >(this)),
+                                               (static_cast< lang::XComponent* >(this)),
+                                               (static_cast< lang::XEventListener* >(this)),
+                                               (static_cast< container::XContainerListener* >(this))
+                                               );
+    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
+}
 
 // XTypeProvider methods.
 
-- 
cgit