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

kill XINTERFACE_IMPL_9

Browse Source 
Change-Id: I651599cf3ec82a31f3260985907b5b2d56665da3
This commit is contained in:
Norbert Thiebaud 2014-03-04 15:41:50 -06:00
parent 2ef98b947e
commit a5aad2ac58
5 changed files with 104 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/ucbhelper/macros.hxx
View File

@ -89,36 +89,6 @@ com::sun::star::uno::Any SAL_CALL Class::queryInterface( \
}\ }\
// 9 interfaces implemented // 9 interfaces implemented
#define XINTERFACE_IMPL_9( Class,I1,I2,I3,I4,I5,I6,I7,I8,I9 ) \
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)), \
(static_cast< I7* >(this)), \
(static_cast< I8* >(this)), \
(static_cast< I9* >(this)) \
); \
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); \
}\
// XTypeProvider decl. // XTypeProvider decl.

39
ucb/source/core/ucb.cxx
View File

@ -251,21 +251,34 @@ UniversalContentBroker::~UniversalContentBroker()
// XInterface methods. // XInterface methods.
void SAL_CALL UniversalContentBroker::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL UniversalContentBroker::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_9( UniversalContentBroker, throw( css::uno::RuntimeException, std::exception )
XUniversalContentBroker, {
XTypeProvider, css::uno::Any aRet = cppu::queryInterface( rType,
XComponent, (static_cast< XUniversalContentBroker* >(this)),
XServiceInfo, (static_cast< XTypeProvider* >(this)),
XInitialization, (static_cast< XComponent* >(this)),
XContentProviderManager, (static_cast< XServiceInfo* >(this)),
XContentProvider, (static_cast< XInitialization* >(this)),
XContentIdentifierFactory, (static_cast< XContentProviderManager* >(this)),
XCommandProcessor ); (static_cast< XContentProvider* >(this)),
(static_cast< XContentIdentifierFactory* >(this)),
(static_cast< XCommandProcessor* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

39
ucb/source/core/ucbstore.cxx
View File

@ -1282,21 +1282,34 @@ PersistentPropertySet::~PersistentPropertySet()
// XInterface methods. // XInterface methods.
void SAL_CALL PersistentPropertySet::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL PersistentPropertySet::release()
throw()
{
OWeakObject::release();
}
css::uno::Any SAL_CALL PersistentPropertySet::queryInterface( const css::uno::Type & rType )
XINTERFACE_IMPL_9( PersistentPropertySet, throw( css::uno::RuntimeException, std::exception )
XTypeProvider, {
XServiceInfo, css::uno::Any aRet = cppu::queryInterface( rType,
XComponent, (static_cast< XTypeProvider* >(this)),
XPropertySet, /* base of XPersistentPropertySet */ (static_cast< XServiceInfo* >(this)),
XNamed, (static_cast< XComponent* >(this)),
XPersistentPropertySet, (static_cast< XPropertySet* >(this)),
XPropertyContainer, (static_cast< XNamed* >(this)),
XPropertySetInfoChangeNotifier, (static_cast< XPersistentPropertySet* >(this)),
XPropertyAccess ); (static_cast< XPropertyContainer* >(this)),
(static_cast< XPropertySetInfoChangeNotifier* >(this)),
(static_cast< XPropertyAccess* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

36
ucb/source/sorter/sortresult.cxx
View File

@ -210,18 +210,34 @@ SortedResultSet::~SortedResultSet()
// XInterface methods. // XInterface methods.
void SAL_CALL SortedResultSet::acquire()
throw()
{
OWeakObject::acquire();
}
XINTERFACE_IMPL_9( SortedResultSet, void SAL_CALL SortedResultSet::release()
XTypeProvider, throw()
XServiceInfo, {
XComponent, OWeakObject::release();
XContentAccess, }
XResultSet,
XRow,
XCloseable,
XResultSetMetaDataSupplier,
XPropertySet );
css::uno::Any SAL_CALL SortedResultSet::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< XComponent* >(this)),
(static_cast< XContentAccess* >(this)),
(static_cast< XResultSet* >(this)),
(static_cast< XRow* >(this)),
(static_cast< XCloseable* >(this)),
(static_cast< XResultSetMetaDataSupplier* >(this)),
(static_cast< XPropertySet* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.

38
ucbhelper/source/provider/resultset.cxx
View File

@ -248,20 +248,34 @@ ResultSet::~ResultSet()
// XInterface methods. // XInterface methods.
void SAL_CALL ResultSet::acquire()
throw()
{
OWeakObject::acquire();
}
void SAL_CALL ResultSet::release()
throw()
{
OWeakObject::release();
}
XINTERFACE_IMPL_9( ResultSet, css::uno::Any SAL_CALL ResultSet::queryInterface( const css::uno::Type & rType )
lang::XTypeProvider, throw( css::uno::RuntimeException, std::exception )
lang::XServiceInfo, {
lang::XComponent, css::uno::Any aRet = cppu::queryInterface( rType,
com::sun::star::ucb::XContentAccess, (static_cast< lang::XTypeProvider* >(this)),
sdbc::XResultSet, (static_cast< lang::XServiceInfo* >(this)),
sdbc::XResultSetMetaDataSupplier, (static_cast< lang::XComponent* >(this)),
sdbc::XRow, (static_cast< css::ucb::XContentAccess* >(this)),
sdbc::XCloseable, (static_cast< sdbc::XResultSet* >(this)),
beans::XPropertySet ); (static_cast< sdbc::XResultSetMetaDataSupplier* >(this)),
(static_cast< sdbc::XRow* >(this)),
(static_cast< sdbc::XCloseable* >(this)),
(static_cast< beans::XPropertySet* >(this))
);
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
// XTypeProvider methods. // XTypeProvider methods.