diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-04 15:37:52 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-04 15:53:31 +0100 |
| commit | 9d5365f7cacecf92f1f056dce7bb6bbaf9f0cc40 (patch) | |
| tree | 3d1790d02d3ced11dcee577b99ab15055e10192e | |
| parent | e128f7806961b391cfb265a1ce009b2e036622ca (diff) | |
Replace preprocessor macro with short function definitions
a2058e7516a01167c2d20ed157500b38db967c64 follow-up.
Change-Id: I402cbab4f78daf0de9d1bfa88698d2b071fcabaf
Reviewed-on: https://gerrit.libreoffice.org/62840
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | dbaccess/source/core/api/querydescriptor.cxx | 11 | ||||
| -rw-r--r-- | dbaccess/source/core/dataaccess/ContentHelper.cxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/inc/apitools.hxx | 11 |
3 files changed, 21 insertions, 13 deletions
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 1ec9a990b97e..0dc0a609d0ff 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -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 ) { diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index b59e70b63490..c52d58c64ae6 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -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( ) diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 6208b146b4c0..ca5c4948d4a9 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -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() \ { \ |