diff options
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/macros.hxx | 12 | ||||
| -rw-r--r-- | include/ucbhelper/resultset.hxx | 3 | ||||
| -rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 57de0edcc725..91a3aa32fb89 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -214,13 +214,6 @@ Class::createServiceFactory( const css::uno::Reference< css::lang::XMultiService // Service without service factory. -// Own implementation of getSupportedServiceNames_Static(). -#define XSERVICEINFO_NOFACTORY_IMPL_0( Class, ImplName ) \ -XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ - \ -css::uno::Sequence< OUString > \ -Class::getSupportedServiceNames_Static() - // 1 service name #define XSERVICEINFO_NOFACTORY_IMPL_1( Class, ImplName, Service1 ) \ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ @@ -228,8 +221,7 @@ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \ css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - css::uno::Sequence< OUString > aSNS { Service1 }; \ - return aSNS; \ + return { Service1 }; \ } // Service with service factory. @@ -256,7 +248,7 @@ Class::getSupportedServiceNames_Static() css::uno::Sequence< OUString > \ Class::getSupportedServiceNames_Static() \ { \ - return css::uno::Sequence< OUString > { Service1 }; \ + return { Service1 }; \ } // 1 service name diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index e2f9945d9055..d7f831fa7b92 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -125,9 +125,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // XComponent virtual void SAL_CALL dispose() diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index d2f6c73b8c3e..e35466fce85c 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -152,9 +152,6 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; - static OUString getImplementationName_Static(); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - // XComponent ( base class of XDynamicResultSet ) virtual void SAL_CALL dispose() |