diff options
| -rw-r--r-- | include/ucbhelper/macros.hxx | 28 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 32 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 31 |
3 files changed, 47 insertions, 44 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 791e3522f7d0..b745f4073b93 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -88,34 +88,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ }\ -// 6 interfaces implemented -#define XINTERFACE_IMPL_6( Class,I1,I2,I3,I4,I5,I6 ) \ -void SAL_CALL Class::acquire() \ - throw() \ -{ \ - OWeakObject::acquire(); \ -} \ - \ -void SAL_CALL Class::release() \ - throw() \ -{ \ - OWeakObject::release(); \ -} \ -com::sun::star::uno::Any SAL_CALL Class::queryInterface( \ - const com::sun::star::uno::Type & rType ) \ - throw( com::sun::star::uno::RuntimeException, std::exception ) \ -{ \ - com::sun::star::uno::Any aRet = cppu::queryInterface( rType, \ - (static_cast< I1* >(this)), \ - (static_cast< I2* >(this)), \ - (static_cast< I3* >(this)), \ - (static_cast< I4* >(this)), \ - (static_cast< I5* >(this)), \ - (static_cast< I6* >(this)) \ - ); \ - return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \ -}\ - // 9 interfaces implemented #define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \ void SAL_CALL Class::acquire() \ diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index cbb7a5e9a4e6..e4caebb8a607 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -130,17 +130,31 @@ FTPContent::~FTPContent() // XInterface methods. +void SAL_CALL FTPContent::acquire() + throw() +{ + OWeakObject::acquire(); +} +void SAL_CALL FTPContent::release() + throw() +{ + OWeakObject::release(); +} -XINTERFACE_IMPL_6( FTPContent, - XTypeProvider, - XServiceInfo, - XContent, - XCommandProcessor, - XContentCreator, - XChild); - - +css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType ) + throw( css::uno::RuntimeException, std::exception ) +{ + css::uno::Any aRet = cppu::queryInterface( rType, + (static_cast< XTypeProvider* >(this)), + (static_cast< XServiceInfo* >(this)), + (static_cast< XContent* >(this)), + (static_cast< XCommandProcessor* >(this)), + (static_cast< XContentCreator* >(this)), + (static_cast< XChild* >(this)) + ); + return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); +} // XTypeProvider methods. 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. |