diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-21 01:28:55 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-03-21 01:28:55 -0500 |
| commit | 359c573d635335779e37fc6a25ddbf3fa7b2331e (patch) | |
| tree | 07d9dd477c61cd8e6b469570edb95369094c5aaf /include/ucbhelper | |
| parent | eabc5d4920513ea41d57b7753d75702fd2d1da60 (diff) | |
kill ucbhelper XSERVICEINFO_NOFACTORY_DECL
Change-Id: I02bb3e7a06451347d8ce72af17461bec91803954
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/macros.hxx | 20 | ||||
| -rw-r--r-- | include/ucbhelper/resultset.hxx | 10 | ||||
| -rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 10 |
3 files changed, 18 insertions, 22 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 88e51e44b7fb..f97d2e3f0051 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -199,26 +199,6 @@ GETTYPES_IMPL_START( Class ) \ CPPU_TYPE_REF( I11 ) \ GETTYPES_IMPL_END -// XServiceInfo decl. - - - -#define XSERVICEINFO_NOFACTORY_DECL() \ - virtual OUString SAL_CALL \ - getImplementationName() \ - throw( com::sun::star::uno::RuntimeException, std::exception ); \ - virtual sal_Bool SAL_CALL \ - supportsService( const OUString& ServiceName ) \ - throw( com::sun::star::uno::RuntimeException, std::exception ); \ - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL \ - getSupportedServiceNames() \ - throw( com::sun::star::uno::RuntimeException, std::exception ); \ - \ - static OUString \ - getImplementationName_Static(); \ - static com::sun::star::uno::Sequence< OUString > \ - getSupportedServiceNames_Static(); - // XServiceInfo impl. internals diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 2e283094b874..46e504dbbfb0 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -124,7 +124,15 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo - XSERVICEINFO_NOFACTORY_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ); + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XComponent virtual void SAL_CALL diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index ce87e82824d7..e47c612ab74f 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -151,7 +151,15 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo - XSERVICEINFO_NOFACTORY_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ); + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XComponent ( base class of XDynamicResultSet ) virtual void SAL_CALL |