de-macroize xmlhelp TVBase

Change-Id: I92e9bc4bbdf18273d26d666d98401cd83a9b1560

2 files changed, 6 insertions, 69 deletions

diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 55f1d93573ed..4225438aaab3 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
+#include <cppuhelper/implbase4.hxx>
 
 namespace treeview {
 
@@ -60,13 +61,11 @@ namespace treeview {
     class TVDom;
     class TVChildTarget;
 
-    class TVBase
-        : public cppu::OWeakObject,
-          public com::sun::star::lang::XTypeProvider,
-          public com::sun::star::container::XNameAccess,
-          public com::sun::star::container::XHierarchicalNameAccess,
-          public com::sun::star::util::XChangesNotifier,
-          public com::sun::star::lang::XComponent
+    class TVBase : public cppu::WeakImplHelper4 <
+        css::container::XNameAccess,
+        css::container::XHierarchicalNameAccess,
+        css::util::XChangesNotifier,
+        css::lang::XComponent >
     {
         friend class TVChildTarget;
 
@@ -74,26 +73,6 @@ namespace treeview {
 
         virtual ~TVBase() { }
 
-        // XInterface
-        virtual com::sun::star::uno::Any SAL_CALL
-        queryInterface(
-            const com::sun::star::uno::Type& aType )
-            throw( com::sun::star::uno::RuntimeException, std::exception);
-
-        virtual void SAL_CALL
-        acquire(
-            void )
-            throw();
-
-        virtual void SAL_CALL
-        release(
-            void )
-            throw();
-
-        // XTypeProvider
-
-        XTYPEPROVIDER_DECL()
-
         // XNameAccess
 
         virtual com::sun::star::uno::Type SAL_CALL
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index 7017f0572d86..cd78d7715c82 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -229,48 +229,6 @@ void SAL_CALL ConfigData::replaceName( OUString& oustring ) const
     }
 }
 
-// XInterface
-
-void SAL_CALL
-TVBase::acquire(
-    void )
-    throw()
-{
-  OWeakObject::acquire();
-}
-
-void SAL_CALL
-TVBase::release(
-              void )
-  throw()
-{
-  OWeakObject::release();
-}
-
-Any SAL_CALL
-TVBase::queryInterface(
-    const Type& rType )
-    throw( RuntimeException, std::exception )
-{
-    Any aRet = cppu::queryInterface( rType,
-                                     (static_cast< XTypeProvider* >(this)),
-                                     (static_cast< XNameAccess* >(this)),
-                                     (static_cast< XHierarchicalNameAccess* >(this)),
-                                     (static_cast< XChangesNotifier* >(this)),
-                                     (static_cast< XComponent* >(this)) );
-
-    return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// XTypeProvider methods.
-
-XTYPEPROVIDER_IMPL_5( TVBase,
-                         XTypeProvider,
-                      XNameAccess,
-                      XHierarchicalNameAccess,
-                      XChangesNotifier,
-                      XComponent );
-
 // TVRead
 
 TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )