de-macroize xmlhelp TVBase

Change-Id: I92e9bc4bbdf18273d26d666d98401cd83a9b1560
This commit is contained in:
Norbert Thiebaud 2014-03-20 17:56:12 -05:00
parent 9343674f58
commit db5407b6ac
2 changed files with 6 additions and 69 deletions

View File

@ -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

View File

@ -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 )