diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-16 15:31:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-20 12:57:31 +0000 |
| commit | 0a14f36501e2e0ce8373464dc1655fdb1e9550b6 (patch) | |
| tree | e175547213c8528499845a78064fd44a714f0ee9 /framework | |
| parent | 00f32691bfcbfbecc824e65e60a506b0035f9643 (diff) | |
split macros to elide unneeded methods
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/macros/xserviceinfo.hxx | 10 | ||||
| -rw-r--r-- | framework/inc/tabwin/tabwindow.hxx | 2 | ||||
| -rw-r--r-- | framework/source/tabwin/tabwindow.cxx | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index f031a37ff8b4..5eadc5a2b655 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -207,7 +207,8 @@ ________________________________________________________________________________ // public // declaration of XServiceInfo and helper functions //***************************************************************************************************************** -#define DECLARE_XSERVICEINFO \ + +#define DECLARE_XSERVICEINFO_NOFACTORY \ /* interface XServiceInfo */ \ virtual ::rtl::OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException ); \ virtual sal_Bool SAL_CALL supportsService ( const ::rtl::OUString& sServiceName ) throw( css::uno::RuntimeException ); \ @@ -215,11 +216,14 @@ ________________________________________________________________________________ /* Helper for XServiceInfo */ \ static css::uno::Sequence< ::rtl::OUString > SAL_CALL impl_getStaticSupportedServiceNames( ); \ static ::rtl::OUString SAL_CALL impl_getStaticImplementationName ( ); \ + /* Helper for initialization of service by using own reference! */ \ + virtual void SAL_CALL impl_initService ( ); \ + +#define DECLARE_XSERVICEINFO \ + DECLARE_XSERVICEINFO_NOFACTORY \ /* Helper for registry */ \ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ); \ static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); \ - /* Helper for initialization of service by using own reference! */ \ - virtual void SAL_CALL impl_initService ( ); \ //***************************************************************************************************************** // public diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index bbad1e22a51a..0cfe4507c048 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -85,7 +85,7 @@ class TabWindow : public ::com::sun::star::lang::XTypeProvider , // XInterface, XTypeProvider, XServiceInfo FWK_DECLARE_XINTERFACE - DECLARE_XSERVICEINFO + DECLARE_XSERVICEINFO_NOFACTORY FWK_DECLARE_XTYPEPROVIDER using ::cppu::OPropertySetHelper::disposing; diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index d496c092b7cc..337c6e707c2a 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -94,7 +94,7 @@ DEFINE_XTYPEPROVIDER_11 ( TabWindow css::beans::XPropertySet ) -DEFINE_XSERVICEINFO_MULTISERVICE ( TabWindow , +PRIVATE_DEFINE_XSERVICEINFO_BASE ( TabWindow , ::cppu::OWeakObject , SERVICENAME_TABWINDOW , IMPLEMENTATIONNAME_TABWINDOW |