diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-17 11:31:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-21 08:24:00 +0200 |
| commit | ee2e8d77fecd39d40182ca3985e801384650a93d (patch) | |
| tree | 483e94cbafae0b375768f513c087988722473701 /svx/source/form/fmservs.cxx | |
| parent | 184c48ee7a4b1c5c6f19a3b9c71bdbc6472068f8 (diff) | |
remove unnecessary macros
Change-Id: Ie73092fa6fc4fa7a95900ef4ba772af0c27d0f39
Diffstat (limited to 'svx/source/form/fmservs.cxx')
| -rw-r--r-- | svx/source/form/fmservs.cxx | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index b65bf8dfae2e..900a0132e77c 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -46,25 +46,11 @@ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno namespace svxform { -#define DECL_SELFAWARE_SERVICE( ClassName ) \ - uno::Reference< uno::XInterface > SAL_CALL ClassName##_Create( \ - const uno::Reference< lang::XMultiServiceFactory >& ); \ - OUString SAL_CALL ClassName##_GetImplementationName(); \ - uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \ - - -#define REGISTER_SELFAWARE_SERVICE( ClassName ) \ - xSingleFactory = ::cppu::createSingleFactory( xServiceFactory, \ - ClassName##_GetImplementationName(), \ - ClassName##_Create, \ - ClassName##_GetSupportedServiceNames() \ - ); \ - if ( xSingleFactory.is() ) \ - xSet->insert( uno::makeAny( xSingleFactory ) ); - - // ------------------------------------------------------------------------ - DECL_SELFAWARE_SERVICE( OAddConditionDialog ) + // declare selfaware service + uno::Reference< uno::XInterface > SAL_CALL OAddConditionDialog_Create( const uno::Reference< lang::XMultiServiceFactory >& ); + OUString SAL_CALL OAddConditionDialog_GetImplementationName(); + uno::Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames(); // ------------------------------------------------------------------------ void ImplSmartRegisterUnoServices() @@ -85,8 +71,14 @@ namespace svxform REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) ); // ------------------------------------------------------------------------ - // FormController - REGISTER_SELFAWARE_SERVICE( OAddConditionDialog ); + // FormController - register selfaware service + xSingleFactory = ::cppu::createSingleFactory( xServiceFactory, + OAddConditionDialog_GetImplementationName(), + OAddConditionDialog_Create, + OAddConditionDialog_GetSupportedServiceNames() + ); + if ( xSingleFactory.is() ) + xSet->insert( uno::makeAny( xSingleFactory ) ); // ------------------------------------------------------------------------ // DBGridControl |