mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kill XINTERFACE_IMPL_3

Browse Source 
Change-Id: I72448b67ae52e89c206f9c313b3d351ae2a56dc3
This commit is contained in:
Norbert Thiebaud
2014-03-04 16:42:53 -06:00
parent 8b40ddd9f0
commit cf1878f5dc
17 changed files with 329 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/ucbhelper/macros.hxx
View File

@@ -35,33 +35,6 @@
#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) ) #define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) )
#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > ) #define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > )
// XInterface impl.
// 3 interfaces implemented
#define XINTERFACE_IMPL_3( Class, Ifc1, Ifc2, Ifc3 ) \
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< Ifc1* >(this)), \
(static_cast< Ifc2* >(this)), \
(static_cast< Ifc3* >(this)) \
); \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
// XTypeProvider decl. // XTypeProvider decl.

25
ucb/source/cacher/cachedcontentresultset.cxx
View File

@@ -2201,13 +2201,28 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory()
// CachedContentResultSetFactory XInterface methods. // CachedContentResultSetFactory XInterface methods.
void SAL_CALL CachedContentResultSetFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL CachedContentResultSetFactory::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( CachedContentResultSetFactory, css::uno::Any SAL_CALL CachedContentResultSetFactory::queryInterface( const css::uno::Type & rType )
XTypeProvider, throw( css::uno::RuntimeException, std::exception )
XServiceInfo, {
XCachedContentResultSetFactory ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XCachedContentResultSetFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// CachedContentResultSetFactory XTypeProvider methods. // CachedContentResultSetFactory XTypeProvider methods.

25
ucb/source/cacher/cachedcontentresultsetstub.cxx
View File

@@ -507,13 +507,28 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory()
// CachedContentResultSetStubFactory XInterface methods. // CachedContentResultSetStubFactory XInterface methods.
void SAL_CALL CachedContentResultSetStubFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL CachedContentResultSetStubFactory::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( CachedContentResultSetStubFactory, css::uno::Any SAL_CALL CachedContentResultSetStubFactory::queryInterface( const css::uno::Type & rType )
XTypeProvider, throw( css::uno::RuntimeException, std::exception )
XServiceInfo, {
XCachedContentResultSetStubFactory ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XCachedContentResultSetStubFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// CachedContentResultSetStubFactory XTypeProvider methods. // CachedContentResultSetStubFactory XTypeProvider methods.

25
ucb/source/cacher/cacheddynamicresultset.cxx
View File

@@ -153,13 +153,28 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory()
// CachedDynamicResultSetFactory XInterface methods. // CachedDynamicResultSetFactory XInterface methods.
void SAL_CALL CachedDynamicResultSetFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL CachedDynamicResultSetFactory::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( CachedDynamicResultSetFactory, css::uno::Any SAL_CALL CachedDynamicResultSetFactory::queryInterface( const css::uno::Type & rType )
XTypeProvider, throw( css::uno::RuntimeException, std::exception )
XServiceInfo, {
XCachedDynamicResultSetFactory ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XCachedDynamicResultSetFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// CachedDynamicResultSetFactory XTypeProvider methods. // CachedDynamicResultSetFactory XTypeProvider methods.

25
ucb/source/cacher/cacheddynamicresultsetstub.cxx
View File

@@ -143,13 +143,28 @@ CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory()
// CachedDynamicResultSetStubFactory XInterface methods. // CachedDynamicResultSetStubFactory XInterface methods.
void SAL_CALL CachedDynamicResultSetStubFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL CachedDynamicResultSetStubFactory::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( CachedDynamicResultSetStubFactory, css::uno::Any SAL_CALL CachedDynamicResultSetStubFactory::queryInterface( const css::uno::Type & rType )
XTypeProvider, throw( css::uno::RuntimeException, std::exception )
XServiceInfo, {
XCachedDynamicResultSetStubFactory ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XCachedDynamicResultSetStubFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// CachedDynamicResultSetStubFactory XTypeProvider methods. // CachedDynamicResultSetStubFactory XTypeProvider methods.

27
ucb/source/core/provprox.cxx
View File

@@ -51,15 +51,28 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory()
// XInterface methods. // XInterface methods.
void SAL_CALL UcbContentProviderProxyFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL UcbContentProviderProxyFactory::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL UcbContentProviderProxyFactory::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( UcbContentProviderProxyFactory, throw( css::uno::RuntimeException, std::exception )
XTypeProvider, {
XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
XContentProviderFactory ); (static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XContentProviderFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucb/source/core/ucbprops.cxx
View File

@@ -309,15 +309,28 @@ UcbPropertiesManager::~UcbPropertiesManager()
// XInterface methods. // XInterface methods.
void SAL_CALL UcbPropertiesManager::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL UcbPropertiesManager::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL UcbPropertiesManager::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( UcbPropertiesManager, throw( css::uno::RuntimeException, std::exception )
XTypeProvider, {
XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
XPropertySetInfo ); (static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XPropertySetInfo* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

25
ucb/source/sorter/sortdynres.cxx
View File

@@ -492,13 +492,28 @@ SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory()
// XInterface methods. // XInterface methods.
void SAL_CALL SortedDynamicResultSetFactory::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL SortedDynamicResultSetFactory::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( SortedDynamicResultSetFactory, css::uno::Any SAL_CALL SortedDynamicResultSetFactory::queryInterface( const css::uno::Type & rType )
XTypeProvider, throw( css::uno::RuntimeException, std::exception )
XServiceInfo, {
XSortedDynamicResultSetFactory ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XSortedDynamicResultSetFactory* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucb/source/ucp/cmis/cmis_provider.cxx
View File

@@ -87,10 +87,29 @@ ContentProvider::~ContentProvider()
{ {
} }
XINTERFACE_IMPL_3( ContentProvider, //XInterface
lang::XTypeProvider, void SAL_CALL ContentProvider::acquire()
lang::XServiceInfo, throw()
com::sun::star::ucb::XContentProvider ); {
OWeakObject::acquire();
}
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< css::ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
XTYPEPROVIDER_IMPL_3( ContentProvider, XTYPEPROVIDER_IMPL_3( ContentProvider,
lang::XTypeProvider, lang::XTypeProvider,

27
ucb/source/ucp/ftp/ftpcontentprovider.cxx
View File

@@ -68,15 +68,28 @@ FTPContentProvider::~FTPContentProvider()
// XInterface methods. // XInterface methods.
void SAL_CALL FTPContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL FTPContentProvider::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3(FTPContentProvider, throw( css::uno::RuntimeException, std::exception )
XTypeProvider, {
XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
XContentProvider) (static_cast< XTypeProvider* >(this)),
(static_cast< XServiceInfo* >(this)),
(static_cast< XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucb/source/ucp/gio/gio_provider.cxx
View File

@@ -74,10 +74,29 @@ ContentProvider::~ContentProvider()
{ {
} }
XINTERFACE_IMPL_3( ContentProvider, // XInterface
lang::XTypeProvider, void SAL_CALL ContentProvider::acquire()
lang::XServiceInfo, throw()
com::sun::star::ucb::XContentProvider ); {
OWeakObject::acquire();
}
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< css::ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
XTYPEPROVIDER_IMPL_3( ContentProvider, XTYPEPROVIDER_IMPL_3( ContentProvider,
lang::XTypeProvider, lang::XTypeProvider,

27
ucb/source/ucp/gvfs/gvfs_provider.cxx
View File

@@ -50,15 +50,28 @@ ContentProvider::~ContentProvider()
// XInterface methods. // XInterface methods.
void SAL_CALL ContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ContentProvider::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( ContentProvider, throw( css::uno::RuntimeException, std::exception )
lang::XTypeProvider, {
lang::XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
com::sun::star::ucb::XContentProvider ); (static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< css::ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

29
ucb/source/ucp/package/pkgprovider.cxx
View File

@@ -145,18 +145,29 @@ ContentProvider::~ContentProvider()
delete m_pPackages; delete m_pPackages;
} }
// XInterface methods. // XInterface methods.
void SAL_CALL ContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ContentProvider::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( ContentProvider, throw( css::uno::RuntimeException, std::exception )
lang::XTypeProvider, {
lang::XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
ucb::XContentProvider ); (static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

26
ucb/source/ucp/webdav-neon/webdavprovider.cxx
View File

@@ -69,14 +69,28 @@ ContentProvider::~ContentProvider()
// XInterface methods. // XInterface methods.
void SAL_CALL ContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ContentProvider::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_3( ContentProvider, css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
lang::XTypeProvider, throw( css::uno::RuntimeException, std::exception )
lang::XServiceInfo, {
ucb::XContentProvider ); css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucb/source/ucp/webdav/webdavprovider.cxx
View File

@@ -124,15 +124,28 @@ ContentProvider::~ContentProvider()
// XInterface methods. // XInterface methods.
void SAL_CALL ContentProvider::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ContentProvider::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( ContentProvider, throw( css::uno::RuntimeException, std::exception )
lang::XTypeProvider, {
lang::XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
ucb::XContentProvider ); (static_cast< lang::XTypeProvider* >(this)),
(static_cast< lang::XServiceInfo* >(this)),
(static_cast< ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucbhelper/source/provider/propertyvalueset.cxx
View File

@@ -271,15 +271,28 @@ PropertyValueSet::~PropertyValueSet()
// XInterface methods. // XInterface methods.
void SAL_CALL PropertyValueSet::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL PropertyValueSet::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL PropertyValueSet::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_3( PropertyValueSet, throw( css::uno::RuntimeException, std::exception )
XTypeProvider, {
XRow, css::uno::Any aRet = cppu::queryInterface( rType,
XColumnLocate ); (static_cast< XTypeProvider* >(this)),
(static_cast< XRow* >(this)),
(static_cast< XColumnLocate* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

27
ucbhelper/source/provider/providerhelper.cxx
View File

@@ -89,10 +89,29 @@ ContentProviderImplHelper::~ContentProviderImplHelper()
delete m_pImpl; delete m_pImpl;
} }
XINTERFACE_IMPL_3( ContentProviderImplHelper, // XInterface
lang::XTypeProvider, void SAL_CALL ContentProviderImplHelper::acquire()
lang::XServiceInfo, throw()
com::sun::star::ucb::XContentProvider ); {
OWeakObject::acquire();
}
void SAL_CALL ContentProviderImplHelper::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL ContentProviderImplHelper::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< css::ucb::XContentProvider* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper, XTYPEPROVIDER_IMPL_3( ContentProviderImplHelper,
lang::XTypeProvider, lang::XTypeProvider,