diff options
| author | Noel Grandin <noel@peralex.com> | 2016-03-14 10:49:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-03-14 11:06:48 +0000 |
| commit | 218cd09611583437c05c33e2aa3b2b81cb416f98 (patch) | |
| tree | 1b3b99677e6acff1f6224f9bd7441f161fcf2596 /include/ucbhelper | |
| parent | f7965b0bcd559451c471a26bf5fd6f542887d95e (diff) | |
inline some use-once macros
Change-Id: I7ebd8fe70b083a772118a1aab8cdfbf795d6f1e5
Reviewed-on: https://gerrit.libreoffice.org/23235
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/macros.hxx | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 483be3405336..57de0edcc725 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -185,16 +185,6 @@ Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ -static css::uno::Reference< css::uno::XInterface > SAL_CALL \ -Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \ - throw( css::uno::Exception ) \ -{ \ - css::lang::XServiceInfo* pX = \ - static_cast<css::lang::XServiceInfo*>(new Class( rSMgr )); \ - return css::uno::Reference< css::uno::XInterface >::query( pX ); \ -} - #define XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \ static css::uno::Reference< css::uno::XInterface > SAL_CALL \ Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \ @@ -254,15 +244,20 @@ Class::getSupportedServiceNames_Static() // 1 service name #define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ -XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \ - \ -css::uno::Sequence< OUString > \ -Class::getSupportedServiceNames_Static() \ -{ \ - css::uno::Sequence< OUString > aSNS { Service1 }; \ - return aSNS; \ -} + XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ + static css::uno::Reference< css::uno::XInterface > SAL_CALL \ + Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \ + throw( css::uno::Exception ) \ + { \ + css::lang::XServiceInfo* pX = \ + static_cast<css::lang::XServiceInfo*>(new Class( rSMgr )); \ + return css::uno::Reference< css::uno::XInterface >::query( pX ); \ + } \ + css::uno::Sequence< OUString > \ + Class::getSupportedServiceNames_Static() \ + { \ + return css::uno::Sequence< OUString > { Service1 }; \ + } // 1 service name #define XSERVICEINFO_IMPL_1_CTX( Class, ImplName, Service1 ) \ |