Kaydet (Commit) 9d5365f7 authored tarafından Mike Kaganski's avatar Mike Kaganski

Replace preprocessor macro with short function definitions

a2058e75 follow-up.

Change-Id: I402cbab4f78daf0de9d1bfa88698d2b071fcabaf
Reviewed-on: https://gerrit.libreoffice.org/62840
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst e128f780
......@@ -151,7 +151,16 @@ sal_Int64 SAL_CALL OQueryDescriptor_Base::getSomething( const Sequence< sal_Int8
return 0;
}
IMPLEMENT_IMPLEMENTATION_ID(OQueryDescriptor_Base)
css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getUnoTunnelImplementationId()
{
static cppu::OImplementationId aId;
return aId.getImplementationId();
}
css::uno::Sequence<sal_Int8> OQueryDescriptor_Base::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
void OQueryDescriptor_Base::setColumnsOutOfDate( bool _bOutOfDate )
{
......
......@@ -82,7 +82,17 @@ void SAL_CALL OContentHelper::disposing()
}
IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content");
IMPLEMENT_IMPLEMENTATION_ID(OContentHelper)
css::uno::Sequence<sal_Int8> OContentHelper::getUnoTunnelImplementationId()
{
static cppu::OImplementationId aId;
return aId.getImplementationId();
}
css::uno::Sequence<sal_Int8> OContentHelper::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
// XContent
Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( )
......
......@@ -152,17 +152,6 @@ public:
// XTypeProvider helpers
#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
css::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
{ \
static ::cppu::OImplementationId aId; \
return aId.getImplementationId(); \
} \
css::uno::Sequence< sal_Int8 > classname::getImplementationId() \
{ \
return css::uno::Sequence<sal_Int8>(); \
}
#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \
css::uno::Sequence< css::uno::Type > classname::getTypes() \
{ \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment